Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev
am: c60f995ae9

Change-Id: I91f906df707b351e082ba5444208ef24fb076534