am 1f909334: am ed5b81c9: Merge "Fix LP32 build."

* commit '1f909334507e6f4c0db20a71a4fceb0397c6ee7d':
  Fix LP32 build.