Merge "MediaTranscodeManager: fix aidl refs only after mass renaming"