Merge "Add the new audio include path on the list of default includes"