Merge "Fix camera.v4l2 module build error" am: 2e88e2d003 am: 2e5ebdc287 am: cfb9a10ba2

Change-Id: If6351c622598606031c9f40e9d1690be3cb2749f