Merge "Prevent ExifInterface incorrectly copying a WebP padding byte"