Merge "fallout from getting rid of IGraphicBufferAlloc"