Merge "Do not export private AIDL files of the media module" into rvc-dev am: 383371cdc5

Change-Id: Iff271892d0cabb03d7eaccd05bfcbab758598e4f