Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev