Merge "Update Avrcp to use RemoteController"