Merge "Switch the audio HAL to 7.1"