Merge "Fix vendor defining macros and neverallows"