Merge "V4L2EncodeComponent: fix build error am: 3db9508be4 am: 15c4e6622b" into tm-d1-dev-plus-aosp