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

Change-Id: Ibde3d4d8a98f3d73db1b0862328f3844138b2c07