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

Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17