Merge "lpmake: Fix some issues in size calculation."