Merge branch 'ndk' into 'master'

NDK r14b and r15b

See merge request !293

diff --combined fdroidserver/common.py
index 875e43a38dd3984c57e7c32dc70c4159f20e2ecc,f84ea0f1a6aaf9261fc4321b07b15fd0a23f00cb..c8fdaad529de3f49e1d9bb12b00d649a2da40583
--- 1/fdroidserver/common.py
--- 2/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -74,7 -74,8 +74,8 @@@ default_config = 
          'r11c': None,
          'r12b': "$ANDROID_NDK",
          'r13b': None,
-         'r14': None,
+         'r14b': None,
+         'r15b': None,
      },
      'qt_sdk_path': None,
      'build_tools': "25.0.2",
@@@ -397,8 -398,8 +398,8 @@@ def get_local_metadata_files()
  
  def read_pkg_args(args, allow_vercodes=False):
      """
 -    Given the arguments in the form of multiple appid:[vc] strings, this returns
 -    a dictionary with the set of vercodes specified for each package.
 +    :param args: arguments in the form of multiple appid:[vc] strings
 +    :returns: a dictionary with the set of vercodes specified for each package
      """
  
      vercodes = {}