WIP: more hwcomposer work

Change-Id: Id2daa95609f8fb53b6d83e7a14597c38c4b3b6df