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

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

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