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