Merge "Remove the old AVRCP code"
am: 4a9e96fc1f

Change-Id: I4a5483cfd4c83ad8f6a50f23a86df220c62b247b