Merge "Fix makefile issues with cts_audio_quality"