Merge "Cut dependency to libmedia_jni.so"
am: b45a1898f8

Change-Id: Ib08bb4f0a6ec7b3891bb5b0fec705bb6305f14fb