Merge "Rename NewAvrcp to Avrcp"