Merge "Move emulator GLES from development.git to sdk.git"