Merge "Fix stride number in C2AllocationGralloc::map"