Manual merge of b273b20c

"am a96c501e: Mark ip-up-vpn as optional"

Change-Id: I6bb8a4ac696ebb2ba24895698ff0a853117ab769
tree: d21eacefb448230b6cefda408a429fa92da6889f
  1. android/
  2. pppd/
  3. CleanSpec.mk