am ed5b81c9: Merge "Fix LP32 build."

* commit 'ed5b81c9e59c0a6c618f43964a4a2639448c0686':
  Fix LP32 build.