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

Change-Id: I730f62bfb2f28cf919614af3a5f7e0b8445079b0