Merge "fix wrong description in AUDIO_HW_VARIANT" into nyc-dev