Merge "mediaeditor shouldn't depend on audioflinger."