Merge "Add methods for allocating and locking GraphicBuffers via gralloc1 flags"