Merge "Remove hphpc support and deprecate related functions"