Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef
am: 162d19f590

Change-Id: Iac2f159014051604d36f61dd253fa4e83127030a