Merge "audio: Explicitly add the audio libraries to brillo_base.mk" into mnc-brillo-dev