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

Change-Id: I049a295140327c982ece8946187cf8b0d8cc678d