fixes to cross-compile for ARM
am: 2faf06ef5a

* commit '2faf06ef5a888cef078a70c1a3a91f673004ef5c':
  fixes to cross-compile for ARM