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

Change-Id: I20e5c37e48820ab870abb3b341aca4ef53cdb5fc