Merge "Add AVRCP unit tests and switch to using mockable interfaces"