Merge "ExifInterface: Code clean up" into nyc-dev