Merge "Modifying Gralloc to handle bytesPerPixel and bytesPerStride"