Merge "gralloc: add flush and reread for locked buffers"