am 09b9193d: Merge "Fix -Werror on 64-bit builds"

* commit '09b9193d10b3849e426c5370a757a0eedc65a7ff':
  Fix -Werror on 64-bit builds