Merge up to ee0f312 from master-chromium. Bring in changes that remove most of the direct dependencies on hidden APIs.