Merge "Add system/media/Android.bp"
am: 0eb9eac06d

Change-Id: Ic355591646ebc2815107f871dc9e26680cca7704