Merge branch 'ndk-r12' into 'master'

NDK r12

See merge request !147

diff --cc docs/fdroid.texi
Simple merge

diff --cc fdroidserver/build.py
index 70ad1aee6a9460afcc023aeaa98009cddeb6f27a,fbdfbf8db44a6a53ea5e252bce6601d2eff7d983..d02947bdb5aaa4583bfc41ce9cec5c1dc10106ce
--- 1/fdroidserver/build.py
--- 2/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -458,9 -458,9 +458,9 @@@ def build_local(app, build, vcs, build_
      """Do a build locally."""
  
      ndk_path = build.ndk_path()
 -    if build.buildjni and build.buildjni != ['no']:
 +    if build.ndk or (build.buildjni and build.buildjni != ['no']):
          if not ndk_path:
-             logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r10e')
+             logging.critical("Android NDK version '%s' could not be found!" % build.ndk or 'r12b')
              logging.critical("Configured versions:")
              for k, v in config['ndk_paths'].items():
                  if k.endswith("_orig"):