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

* commit 'faecc3f800cf2eaaf94f563faaba44193582e8b0':
  ExifInterface: Code clean up

Change-Id: I527fe115f16725d9f1ab371e96c776d81a62e36d