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

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