Merge "Use different hwcomposer HALs for hikey and hikey960" am: 5ba6c593c0
am: 8638c8a3ec

Change-Id: I8f529daace175e53cf20d07a6aa806bf3e8c275a