Merge \\"Add the EGL_ANDROID_get_frame_timestamps extension\\" into nyc-mr1-dev am: ebe3d7a2e3
am: 3f9ee94064

Change-Id: I2d2623ee846694d2623c617fd53e8001225cf311