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

Change-Id: I6bd28a829dfbb5056b860c8667e17defcc632e5c