Merge "Disable XOM in camera.v4l2." am: 1908ba0732
am: 6ca60bc346

Change-Id: I70763a0404c50059e17d6897351fc5b343105c69