Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590 am: 7eb3f1c1c4  -s ours
am: 694d492664  -s ours

Change-Id: Ic798c8f3473405a0fac8306c1ab7db89f2604efb