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

Change-Id: Ieddaa83faf9166329a39b55b4b16e0897c6bdca4