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

Change-Id: I3feb1a43924de757aa2cf18e9e99a17a1e4bf913