Android SDK ADT release 20
Merge "Run dnsmasq with options --keep-in-foreground and --pid-file."