Merge "Deprecate producer/consumer usage in BufferHub" into pi-dev
am: 99996d0051

Change-Id: Id6b32bf6706cf3bd151d4b74ae7bb21061d64370