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

Change-Id: I3d90b838e9d6ab67357cdb33c4a8c0c828e7b1bd