Merge "C2AllocatorGralloc: Convert C2Rect to Rect correctly"