am bd93fee7: Merge "Support GLES acceleration in 64bit emulator on device side"

* commit 'bd93fee73b02d0b223b441c34a4f8e04eb57291d':
  Support GLES acceleration in 64bit emulator on device side