Merge "mm-video: vdec: increase o/p buffer count in testapp"