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

* commit '3f22fdc0faeb35ad6b7476f87938e7b2554a2255':
  Android emulator opengl - unit testing render control api