Merge "libmedia_jni.so doesn't need libjhead.so am: 9a4a34af -s ours am:...

Merge "libmedia_jni.so doesn't need libjhead.so am: 9a4a34af  -s ours am: 398d50fe  -s ours am: 49fc959b  -s ours am: 23118a9b  -s ours am: 45cd809c  -s ours am: ce4c7df6  -s ours am: 035e2a5c  -s ours am: 4e5ed845  -s ours am: 3cd244e8  -s ours am: a9bf75f5  -s ours am: 21caf4ae  -s ours am: 009b3c6a  -s ours am: acbd7ba4  -s ours am: 9454abb0  -s ours" into oc-dr1-dev-plus-aosp