am 98c75d03: am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api"

* commit '98c75d03495e55c756db5d76218467f355eb8193':
  Android emulator opengl - unit testing render control api