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

Change-Id: I29a3a5d11f8bc07f42d0fdc87b047ac6aca2ace7