Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev