Merge "Update makefiles for audio."