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

Change-Id: I3c4b0d56ff6fdec43d69e9172c75b049a2a9fb5e