am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp * commit 'a8f117d3': DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer