am 6cc044b0: am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev

* commit '6cc044b0b0a095249f3929975bb7bd2f765c1327':
  ExifInterface: fix class load failure