Merge "gralloc: Fix calculation of bytesPerStride in Lock()."