Merge "Revert "Revert 3 patches from Hangyu to get Chrome to build:""