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

Change-Id: I41461d7725c82f27179524ae95f2e294b58112e6