[automerger skipped] Merge "Cut dependency to libmedia_jni.so" am: b45a1898f8 am: 5f8b38663a
am: 3d7e3cb756 -s ours
am skip reason: change_id If283fefca5cf4e282d1c29876b78037bc9df7625 with SHA1 92f6462fb3 is in history

Change-Id: Id948e7ec3ad3beb258c20e68487b3c297939e2d7