Merge "ExifInterface: fix NegativeArraySizeException" am: c57b472d67
am: 582e612fdc

Change-Id: I671ef98f05431e7c4baa2a7b84f6cb04a82c5d9d