Merge branch 'CR_1560_v4l2_changhuang.liang' into 'jh7110-5.15.y-devel'