Merge "Turn off HWUI_ENABLE_OPENGL_VALIDATION" into nyc-dev