Merge "Remove framework code that has moved to frameworks/libs/net" am: 79b6ad735b am: 37413a4b82

Change-Id: Ic03b259e256f935c2c625f294bea497b82b6317e