Merge "Revert "Get rid of IGraphicBufferAlloc""