CHROMIUM: Merge remote-tracking branch 'upstream/master' into HEAD

BUG=b:171181701, b:171182861
TEST=duo & meet apk, various webgl, asphalt9, PUBG

Change-Id: If484be2810f7e3053c109784b48263d80228bd89