Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: 2f49f81c06 am: d4080f9f75
am: 829f3bcd06

Change-Id: I661f98732680bfd26d7d3fb46393bdcd59095e09