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

Change-Id: I2a69c6882341e7c9fa0fe664bffaef14346da6a6