Merge change 3974 into donut

* changes:
  Integrate unsubmitted cupcake change 147342: 	CTS: clean up code in android.net package
tree: 2a5640e9e0d2ce0d1dba231e859d9947dd0cb780
  1. tests/
  2. tools/
  3. Android.mk