Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55...

Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b55 am: 3c979c6a am: 710605dc  -s ours am: 39001043  -s ours am: 6e0cedca am: aa0ad336 am: 407bb6ad  -s ours am: 3e4c8a96 am: a1f106b5 am: 9e48fa5d am: 249acab9  -s ours am: aa93e857 am: e6c39fb5\" into nyc-mr1-dev-plus-aosp
am: 5dfda0c4  -s ours

Change-Id: Ie3adc5300d2fc6eb26c3dde104d8462eba7443ed