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

Change-Id: I20b8398f1fe410819f18a0afcd8646c75c594fb8