Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35  -s ours am: a2044118a5 am: e8a7640503 am: f98fcae527 am: 4f88587f65  -s ours am: 3fc550a0e3 am: d6c5a06460\" into nyc-mr1-dev-plus-aosp
am: a5b47a45ea  -s ours

Change-Id: If643c18539b14a3d01088fa08a229a4aebac7dcd