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

Change-Id: I45ad5f9397cce75be60d1efcdf860da285409db5