Use HPHP_VERSION constant to detect HipHop

Follows-up Ic3e769f1fbad4f7ad26dd819406796fee48c6b45.

Change-Id: I0210002c05efd79242b00592639b7be50a79020b
Merge "Use HPHP_VERSION constant to detect HipHop"