am b21e7e40: Fixes build on arm64

* commit 'b21e7e40b9f751f956cdc437b6546c3052d6b604':
  Fixes build on arm64