Merge "Convert libmedia to Android.bp" am: 23f4ff1d65 am: 7e47c13f37 am: 6add681c5e  -s ours
am: f9ef332d4f

Change-Id: I76c2eb6da3c34113780e9e8d838831a7efe05345