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

Change-Id: Id0ddf5a27a5d2e1e76d8a7521c518547f169a2c9