am b8e2f089: am d294027b: Merge 2fa7b9ff

* commit 'b8e2f0896ec6231e28db93d8900f61e8a2e43f67':
  Move emulator GLES from development.git to sdk.git