Merge "CHROMIUM: Merge 'v6.1.118' into chromeos-6.1" into chromeos-6.1