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

Change-Id: Ia0ef3447825b95230854b9f3f9472c1bd4431acc