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

Change-Id: Idf5e268b0c1fa1f919db7b3fba3784bab32dc849