Merge "gralloc: Fix calculation of bytesPerStride in Lock()." into rvc-dev