Merge "Rename NewAvrcp to Avrcp"
am: ebb78384eb

Change-Id: Ic63c66b5daf76215c76c6c5424d1b63fc69c2f8f