Merge "Revert "Disable XOM in camera.v4l2."" am: 06ea58579b
am: 36de427e99

Change-Id: Ic5ac731ef527887cd6c8844d77d7ba1fab192f32