am f3c61c66: am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev

* commit 'f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7':
  TextureView/GLES20Canvas: Support synchronous GLConsumers