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

Change-Id: I59231a87d4e9c16c47e85155cf9722495fe296a3