Merge "Revert "Include vendor gralloc0 flags in gralloc1 conversion."" into oc-dev am: 3433cbd567
am: baef8fd8e0

Change-Id: I5c0870e33e42f729dd610ea0db65c05dbb1d4338