Merge "Revert change removing AVRCP.kl and cpcap-key.kl"