Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 5c4b6301d5

Change-Id: I5e0b4e50352428ca5886a808b5667daffb4f2e4c