Merge "Make libvpx Chromium build friendly"