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

* commit '233e7e9f64be5e85196dd959824bce9a69b2fd99':
  ExifInterface: fix class load failure