media: dvb-core: Fix for dvb_ringbuffer merge conflict

resolve the dvb_ringbuffer merge conflicts due to
v4.4-16.09-android-tmp branch merging.

CRs-Fixed: 1086706
Change-Id: Ic5ec87d48e86fd9504fed7232286cf81b46c4035
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>