Merge "DO NOT MERGE: Add the option to reserve headroom for partition images....

Merge "DO NOT MERGE: Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." into cw-f-dev