Merge "lpmake: Pass the block size to MetadataBuilder."
am: 1b184b4451

Change-Id: I947f809c536ff35d392e8d925bb280ea1dce61ce