Merge "Fix LP32 build."