Merge changes I1c0be5f8,Id837c19a

* changes:
  gralloc960: Extend gralloc to use dmabuf heaps
  hikey/hikey960: Add userland support for dmabuf heap dev dir