Merge \\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\" into mnc-dev am: f4710c174f am: aa85bf99ee am: 452dc91f2d
am: f78637ff64  -s ours

Change-Id: Ia67c680bd2a72b7e0ce4f6d1225bc85b1b4feadb