Merge "Use wfIsHHVM() instead of a HipHop-specific environment variable"