Merge "Add header-abi-linker -symbol-tag-policy" into main