Re-base 3.8 config on ChromeOS upstream