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