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

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