drm_hwcomposer: Add Marissa and remove Haixia
am: d35880b46f

Change-Id: I1cf1a724d6c1fd65eca4a6fbe0c76f7969d4cca4