Merge "Add a2dp vendor codec extension"