Merge "Convert libmedia to Android.bp"
am: 23f4ff1d65

Change-Id: Ic609d797b7e067f2e5686d0c38958badc9561ad1