am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator...
am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '6e3bbf64':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.