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

* commit 'dccf65ef024978ce26ddc96ced58b2417a50967f':
  Fix LP32 build.