Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev