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

This reverts commit 749e0c7b2883139afa14b4886bbd6a940d021f4f.

Change-Id: I0c63a152baf94d38496dd925a40040366153bf4f
4 files changed