Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf  -s ours am: 3900104379  -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53  -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988  -s ours am: aa93e8571f am: e6c39fb5b3" into nyc-mr1-dev-plus-aosp