Merge "Dvr api usages should follow AHardwareBuffer" into oc-dev