Merge "lpmake: Fix some issues in size calculation." am: 7290f63866

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2428334

Change-Id: I057fb1b58a0a50190a91c18451268e3ef8dde634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>