Merge "Remove unused link libraries from libmedia_jni_utils" am: 8d132dd384
am: 7224f7b7c8

Change-Id: I25f89a1a67fda0326b864540619f4688d8e83db7