drm_hwcomposer: Add Marissa and remove Haixia am: d35880b46f am: 578059aa61 am: 3d139a7676 am: 9ca8544e73
am: b1484317a3

Change-Id: Ifbb43bef9e1c81b61a2321774eb21cec1532a0fe