Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960
am: 2f49f81c06

Change-Id: I7745b517d16c4efacb0c9c50aae9e70cb08b8348