CHROMIUM: Merge remote-tracking branch 'origin/master' into chromeos-iris

BUG=b:152104322
TEST=4k video plays back correctly, no isl errors in log

Change-Id: I2f7678c3066a418b0d6c64789254d53126003cda