Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960
am: b5fc0cb2f3

Change-Id: Ie47e22a829738fd3e01fc73b0236d05c0c414a1d