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

Change-Id: I8c8ffe17ba8fb63fe94031c7e742dc9e062fe801