Merge "media: Fix Android.bp format" into main