Merge "Add the option to reserve headroom for partition images. This is useful...
Merge "Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." am: bba00b2c am: e255054a
am: b83a34bf
Change-Id: I5ae85fbf49d7cfae4c72d5cdec2ee5cfc28e8d8e