Merge "Remove framework code that has moved to frameworks/libs/net" am: 03d86d613c am: 840975d91d

Change-Id: Ic03b259e256f935c2c625f294bea497b82b6317e
tree: dc3c662c8d0b28fe48270a23124b38c1a84245ba
  1. core/
  2. services/
  3. tests/