Merge change 4054 into donut

* changes:
  Add VpnServices to PRODUCT_PACKAGES.
tree: ee48cf4509fe7e3a7ae430639cc75e87b1bc88ec
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh