Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev