Merge "Overhual DvrBuffer and DvrBufferQueue API: Step 1" into oc-mr1-dev
am: fcc70bdc9e

Change-Id: Ica3fd8703c0db53dd84e20d3bd7a70489ba08afc