Merge "amlv4l2dec: CB1 probe v4l2 resolution,update it [1/1]"