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

* commit '349e486f5e6c8f8dd482641a27f9e7cce04ea623':
  Fix arm64 build: move macro usage after definition.