Merge "Add AudioRouting interface for MediaPlayer"