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

* commit '0aa24748348e5e830f0a069b5f44d90444ce1709':
  Android emulator opengl - unit testing render control api