Merge "audio: Add flags to makefiles"