Merge "C2AllocatorGralloc: Fix stride in map()"