Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"
am: d4414cf278

Change-Id: Ib0b110fd5cf07b6693213fce8a45bc7be62d71cf