Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev