Merge \"Disable support for EGL_ANDROID_get_frame_timestamps\" into nyc-mr1-dev
am: 3e42f7f817

Change-Id: I6714ff2d477e035f3bdd29f815345218a5957e90