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

Change-Id: I4421c0fd30ce9f93cfcb402d34600ae08a9cdd0f