Merge "ExifInterface: Clean up test code and increase test coverage" into nyc-dev