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

Change-Id: Ia803f91a5487bb0d42ecc73163c34c151795d1c3