Merge branch 'master' into 'master'

Update VLC, Orbot & CoolReader

metadata/org.coolreader.txt

@@ -301,6 +301,13 @@ Build:3.1.2-38,858
     subdir=android
     buildjni=yes
 
+Build:3.1.2-39,859
+    commit=cr3-3.1.2-39-market
+    subdir=android
+    target=android-19
+    rm=android/build.properties
+    buildjni=yes
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:3.1.2-39

metadata/org.torproject.android.txt

@@ -73,6 +73,13 @@ Build:13.0.7,86
     prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
     build=NDK_BASE=$$NDK$$ make -C external
 
+Build:14.0.0,100
+    commit=14.0.0
+    submodules=yes
+    rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo/libs,res/raw/tor.mp3,res/raw/obfsproxy.mp3,res/raw/privoxy.mp3,res/raw/xtables.mp3
+    prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
+    build=NDK_BASE=$$NDK$$ make -C external
+
 Auto Update Mode:None
 Update Check Mode:Tags ^[^-]*$
 Current Version:14.0.0

metadata/org.videolan.vlc.txt

@@ -161,6 +161,28 @@ Build:0.9.1,9104
         ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
     buildjni=no
 
+Build:0.9.3,9302
+    commit=0.9.3
+    subdir=vlc-android
+    forcevercode=yes
+    srclibs=VLC@508b744ee81d50a388544676236db0eaa1e6debf
+    prebuild=sed -i '/ant/d' ../Makefile && \
+        ln -s vlc-android/$$VLC$$ ../vlc
+    build=cd ../ && \
+        ANDROID_ABI=x86 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
+
+Build:0.9.3,9304
+    commit=0.9.3
+    subdir=vlc-android
+    forcevercode=yes
+    srclibs=VLC@508b744ee81d50a388544676236db0eaa1e6debf
+    prebuild=sed -i '/ant/d' ../Makefile && \
+        ln -s vlc-android/$$VLC$$ ../vlc
+    build=cd ../ && \
+        ANDROID_ABI=armeabi-v7a ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release
+    buildjni=no
+
 # +0: - (upstream)
 # +1: mips
 # +2: x86