Merge "HiKey960: Properly integrate mali bifrost gralloc for HiKey960"
am: 4e1429c146

Change-Id: I5b85287eb0182ce9c1cc09ff8b5b40c7b75d35b1