Merge "Fix failure in ExifInterface on certain HEIF files" into pi-dev