Merge "Remove most of the NetworkStack dependencies on frameworks/base." into sc-dev