am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."

* commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.