am d294027b: Merge 2fa7b9ff

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