Merge "Add eglPresentationTimeANDROID" into jb-mr2-dev