Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev