Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: b5fc0cb2f3
am: 3455f409f1

Change-Id: I17402bcf858b8c7f1c94ba53f2bc69985c6e34fa