Merge "Add the EGL_ANDROID_get_frame_timestamps extension" into nyc-mr1-dev