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

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