Merge "Include vendor gralloc0 flags in gralloc1 conversion." into oc-dev