Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

Conflicts:
	jni/shadowsocks/local.c

jni/Application.mk

@@ -1 +1,2 @@
 APP_PLATFORM = android-9
+NDK_TOOLCHAIN_VERSION = clang3.1

jni/shadowsocks/local.c

@@ -603,6 +603,11 @@ int main (int argc, char **argv)
         close(STDIN_FILENO);
         close(STDOUT_FILENO);
         close(STDERR_FILENO);
+    } else {
+        pid_t pid = getpid();
+        FILE *file = fopen("/data/data/com.github.shadowsocks/shadowsocks.pid", "w");
+        fprintf(file, "%d", pid);
+        fclose(file);
     }
 
     _server = strdup(server);