Merge "audio-hal: Gen4 specific changes for test app"