DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6
am: 710605dccf  -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737