am ee8e31ad: am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044

* commit 'ee8e31ad5229634770ecd6eb5c3a52ff03284c17':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer