Merge "Remove the build dependency on Chromium."