Merge "bullhead: Use gralloc1 adapter flag" into oc-dev