am 8f3b8f52: Merge "Fix arm64 build"

* commit '8f3b8f523ed594b48d28ca0b9a2651d209f29e26':
  Fix arm64 build