Merge "Update GraphicBufferAllocator users to pass both producer and consumer usages"