contains the following changes in chromium:
https://chromium.googlesource.com/chromium/src/+log/2d938c84..7fa6701b

R=kjellander@chromium.org
TBR=kjellander@chromium.org
BUG=libyuv:626

Review URL: https://codereview.chromium.org/2183633002 .