Merge "Update makefiles for audio."
am: e5b3e4b869

Change-Id: Ibb692f7dafbf1bc0e905ca8acac23221f6e1b193