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

Change-Id: I77693a21c8673e1fbf91c28e6e0b944144169e66