Merge "vidc: Set number of buffers to the actual buffer count"