Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 5c4b6301 am: 288fdeb4 Change-Id: I82f49f1256bd5f81049d8b6f224ef507e63a48fb