DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours
am: a2044118a5

Change-Id: Iacf1a129eded02dcfe14a13bbcc0b324b462ec4c