Merge "Revert "Remove framework code that has moved to frameworks/libs/net""