Merge "Move frameworks/base depedencies into NetworkStack."