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

Change-Id: I25b4611d1531c087e6425f18493a673e1b569213