Merge "Merge chromium to r11.0.672.0: Compile fix"