Merge "Changes for LegacyVpnTest" into oc-dev
tree: cf96c3a0246f88dd47378fdd9049fad2f47ca654
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg