Merge "Support l11n of Qualcomm® aptX™ strings" into oc-mr1-dev