Merge "Replace android::dvr::BufferHubDefs with android::BufferHubDefs"