vidc: merge a few changes from CAF jb-chocolote MR1

Change-Id: I13de9478b6c7544d60c16abe167e1affc33c8f1a