Merge "Fix makefile issues with cts_audio_quality" am: a3f1340ef2
am: 8ed4b13201

* commit '8ed4b1320199ee13db3e8468b47e5054eb7d76bb':
  Fix makefile issues with cts_audio_quality

Change-Id: Ibc589134d811660f9267f047448b524a5849b8a5