am 1404e654: Merge "Fix 64-bit builds." into lmp-dev

* commit '1404e6547265c50b85262436f8275c80750c6808':
  Fix 64-bit builds.