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

Change-Id: I188c3ed17c684040daa4b164507eebd9df5c0947