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

Change-Id: If30e083b58365ad922732fc86beaf2f03209cf88