am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp

* commit '2af77026e7d463da075813aed80babb18370d26a':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer