cleanup

Change-Id: Icd0b79edf384d14618623eb49ffe09c075f623fd
Merge remote-tracking branch 'github/katkiss-4.4' into katkiss-4.4
HWComposer 1.0 for TF101 + misc cconf changes

Change-Id: I127ddc7d2ac4a0cb15b6077343d0ab802a5b9918