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
am: 290b8c71e4  -s ours

Change-Id: Id3fab922ccadc11936990fc4eb4707d26b808b41