Merge change 8966 into donut

* changes:
  Add tests for android.net.vpn.