Merge "Add GLESv3 to future NDK release" into jb-mr2-dev