am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper"

* commit 'd5df4a71c659f6ca450be596dda87150dd44b6a3':
  Android emulator opengles - unit test gles wrapper