Merge "Revert "Remove framework code that has moved to frameworks/libs/net""
tree: 1ee3cb7d5c93dd8fbfd25915a28d0b8ce2a99525
  1. core/
  2. services/
  3. tests/