Merge "Use HHVM+EZC internal tidy"