am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1

* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
  VPN: delete the "abort" file before starting VPN daemons.