DO NOT MERGE: drm_hwcomposer: Don\'t use Plan() in SquashAll am: 8eb85ff7d7  -s ours
am: 45ea1b1c69

* commit '45ea1b1c6943ff56569aca80b897259f4f04562d':

Change-Id: Ib1a1734fa7834554ddcc5542a77b7590dc932ec1