Merge "Disable support for EGL_ANDROID_get_frame_timestamps" into nyc-mr1-dev