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

Change-Id: I19c370fc8b22eb8efac926e480f3482427abb6c6