Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev