[automerger skipped] Remove -without-aidls filegroups for the media apex. am: df6c25d518 am: c9007ad36e am: b88b263129
am: 9133c4bf2a -s ours
am skip reason: change_id I794f6d0a7bcbef311d345d6e18ca311800af8ef4 with SHA1 d2411f730f is in history

Change-Id: Iec56e9ebbcbed5f874c3bf243f7b0be487a70a8e