Merge "Tweak fix for setXSSAuditorEnabled in LayoutTestController."