Merge "drm_hwcomposer: make sure primary plane is allocated for squash" into oc-mr1-dev am: 93be6aefeb
am: b764b4e1d8

Change-Id: Iab26ce06811d0a177c1b89d3965ac01b4c851316