[automerger skipped] Merge "Remove libexif usage from libmedia_jni.so" am: 04077d07d7 -s ours
am: a3f4de14cb -s ours
am skip reason: change_id I33128db25b8aae60df7854c61fc2a3873a1bced9 with SHA1 efb865ace2 is in history

Change-Id: I7f3fdcfa1a8eed727b7a2de338674c53663f819f