Merge "Include vendor gralloc0 flags in gralloc1 conversion." into oc-dev am: 5658a29c0c
am: f879e859b4

Change-Id: I35a4d77162a0395e469f3c5e30b4182d79b64c39