Merge "Addresses API review feedback on HwAudioSource.Builder"