Merge "Fix arm64 build: move macro usage after definition."