Merge "lpmake: Use a default alignment of 1MiB."
am: 791c9a6056

Change-Id: If02537702af4942cfd59852c61615d15a39ed2f0