Merge "Use different hwcomposer HALs for hikey and hikey960"