am 4bda89b6: Merge changes I6379d6b1,I77794044

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