Merge "ExifInterface: Clean up test code and increase test coverage" into nyc-dev am: 7625a59
am: 018c382

* commit '018c3822772cad73f814b7b1ea96de5989577c7b':
  ExifInterface: Clean up test code and increase test coverage

Change-Id: I8c2d3738bad923cd6626664fd16b21fe4b599a06