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

Change-Id: Iac245c606378923f2f8e9f9fa65f6951af39ec97