am 699650b5: am 4fc26310: Merge "Emulator Opengl unit test - use sperate implementation libraries"

* commit '699650b50b38b2c716731e0943ebee2e79b3d4ee':
  Emulator Opengl unit test - use sperate implementation libraries