Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1  -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04  -s ours am: d1b350ce7d am: d8f381af5a am: e863a0c868 am: 16b9011dd5  -s ours am: f5cddc7ef6 am: b4f2154ee2\" into nyc-mr1-dev-plus-aosp
am: e889c1daf6  -s ours

Change-Id: Ifd37b6e57f28c33b4d34f305f792c815d5a5ac03