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 device with low disk space with different build variants." into oc-dev