Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev am: e3a09ad488
am: 8a1bd7c371

Change-Id: Ia19e321377eb958d7b502952b8d1d3e2fbc11816