Merge "Merge chromium to 10.0.634.0: Compile fix"