Merge "asoc: bolero: Ensure va-macro is registered before other macros"