Merge "Remove the old AVRCP code"