Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev