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

Change-Id: Iabed988ba2a1e617f3ec33f5651363123c312c9d