diff --git a/README.MD b/README.MD
index cb0631b18..4e9e97a9d 100644
--- a/README.MD
+++ b/README.MD
@@ -47,20 +47,21 @@ For installation issues, upload both boot image and install logs.<br>
 For Magisk issues, upload boot logcat or dmesg.<br>
 For Magisk Manager crashes, record and upload the logcat when the crash occurs.
 
-## Building Magisk
+## Building and Development
 
+- Magisk builds on any OS Android Studio supports. Install Android Studio and do the initial setups.
 - Clone sources: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
-- Magisk builds on any OS Android Studio supports. Install Android Studio and import the project.
-- Python 3.6+. For Windows only, install Colorama with `pip install colorama` in admin shell.
-- Use the JDK bundled in Android Studio:
+- Install Python 3.6+. For Windows only, install Colorama with `pip install colorama` in admin shell.
+- Configure to use the JDK bundled in Android Studio:
 	- macOS: `export JAVA_HOME="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home"`
 	- Linux: `export PATH="/path/to/androidstudio/jre/bin:$PATH"`
 	- Windows: Add `C:\Path\To\Android Studio\jre\bin` to environment variable `PATH`
-- Set environment variable `ANDROID_HOME` to the Android SDK folder
-- Download / clone [FrankeNDK](https://github.com/topjohnwu/FrankeNDK) and set environment variable `ANDROID_NDK_HOME` to the folder
-- Set configurations in `config.prop`. A sample file `config.prop.sample` is provided.
-- Run `build.py` to see help messages. For each supported actions, use `-h` to access help (e.g. `./build.py all -h`)
-- By default, the script builds everything in debug mode. If you want to build Magisk Manager in release mode (with the `-r, --release` flag), you need a Java Keystore (only `JKS` format is supported) to sign APKs and zips. For more information, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
+- Set environment variable `ANDROID_HOME` to the Android SDK folder (can be found in Android Studio settings)
+- Run `./build.py ndk` to let the script download and install NDK for you
+- Set configurations in `config.prop`. A sample `config.prop.sample` is provided.
+- To start building, run `build.py` to see your options. For each action, use `-h` to access help (e.g. `./build.py all -h`)
+- To start development, open the project in Android Studio. Both app (Kotlin/Java) and native (C++/C) source code can be properly developed using the IDE, but *always* use `build.py` for building.
+- `build.py` builds in debug mode by default. If you want release builds (with `-r, --release`), you need a Java Keystore to sign APKs and zips. For more information, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
 
 ## Translation Contributions
 
diff --git a/build.py b/build.py
index 70fb301ed..f813ad8b0 100755
--- a/build.py
+++ b/build.py
@@ -31,10 +31,10 @@ if 'ANDROID_HOME' not in os.environ:
     error('Please add Android SDK path to ANDROID_HOME environment variable!')
 
 try:
-    subprocess.run(['java', '-version'],
+    subprocess.run(['javac', '-version'],
                    stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 except FileNotFoundError:
-    error('Please install JDK and make sure \'java\' is available in PATH')
+    error('Please install JDK and make sure \'javac\' is available in PATH')
 
 import argparse
 import multiprocessing
@@ -44,21 +44,26 @@ import errno
 import shutil
 import lzma
 import tempfile
-
-# Constants
-if 'ANDROID_NDK_HOME' in os.environ:
-    ndk_build = os.path.join(os.environ['ANDROID_NDK_HOME'], 'ndk-build')
-else:
-    ndk_build = os.path.join(
-        os.environ['ANDROID_HOME'], 'ndk-bundle', 'ndk-build')
+import platform
+import urllib.request
+import os.path as op
+from distutils.dir_util import copy_tree
 
 cpu_count = multiprocessing.cpu_count()
-gradlew = os.path.join('.', 'gradlew' + ('.bat' if is_windows else ''))
 archs = ['armeabi-v7a', 'x86']
 arch64 = ['arm64-v8a', 'x86_64']
 support_targets = ['magisk', 'magiskinit', 'magiskboot', 'magiskpolicy', 'resetprop', 'busybox', 'test']
 default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
-build_tools = os.path.join(os.environ['ANDROID_HOME'], 'build-tools', '29.0.3')
+
+ndk_ver = '21'
+ndk_ver_full = '21.0.6113669'
+build_tools_ver = '29.0.3'
+
+ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk')
+ndk_path = op.join(ndk_root, 'magisk')
+ndk_build = op.join(ndk_path, 'ndk-build')
+build_tools = op.join(os.environ['ANDROID_HOME'], 'build-tools', build_tools_ver)
+gradlew = op.join('.', 'gradlew' + ('.bat' if is_windows else ''))
 
 # Global vars
 config = {}
@@ -67,7 +72,7 @@ STDOUT = None
 def mv(source, target):
     try:
         shutil.move(source, target)
-        vprint(f'mv: {source} -> {target}')
+        vprint(f'mv {source} -> {target}')
     except:
         pass
 
@@ -75,7 +80,7 @@ def mv(source, target):
 def cp(source, target):
     try:
         shutil.copyfile(source, target)
-        vprint(f'cp: {source} -> {target}')
+        vprint(f'cp {source} -> {target}')
     except:
         pass
 
@@ -83,20 +88,25 @@ def cp(source, target):
 def rm(file):
     try:
         os.remove(file)
-        vprint(f'rm: {file}')
+        vprint(f'rm {file}')
     except OSError as e:
         if e.errno != errno.ENOENT:
             raise
 
 
-def mkdir(path, mode=0o777):
+def rm_rf(path):
+    vprint(f'rm -rf {path}')
+    shutil.rmtree(path, ignore_errors=True)
+
+
+def mkdir(path, mode=0o755):
     try:
         os.mkdir(path, mode)
     except:
         pass
 
 
-def mkdir_p(path, mode=0o777):
+def mkdir_p(path, mode=0o755):
     os.makedirs(path, mode, exist_ok=True)
 
 
@@ -112,28 +122,35 @@ def xz(data):
     return lzma.compress(data, preset=9, check=lzma.CHECK_NONE)
 
 
-def load_config(args):
-    # Some default values
-    config['outdir'] = 'out'
-    config['prettyName'] = 'false'
-    config['keyStore'] = 'release-key.jks'
-
-    # Load prop file
-    if not os.path.exists(args.config):
-        error(f'Please make sure {args.config} existed')
-
-    with open(args.config, 'r') as f:
+def parse_props(file):
+    props = {}
+    with open(file, 'r') as f:
         for line in [l.strip(' \t\r\n') for l in f]:
             if line.startswith('#') or len(line) == 0:
                 continue
             prop = line.split('=')
             if len(prop) != 2:
                 continue
-            config[prop[0].strip(' \t\r\n')] = prop[1].strip(' \t\r\n')
+            props[prop[0].strip(' \t\r\n')] = prop[1].strip(' \t\r\n')
+    return props
+
+
+def load_config(args):
+    # Load prop file
+    if not op.exists(args.config):
+        error(f'Please make sure {args.config} exists')
+
+    # Some default values
+    config['outdir'] = 'out'
+    config['prettyName'] = 'false'
+    config['keyStore'] = 'release-key.jks'
+
+    config.update(parse_props(args.config))
+
+    # Sanitize configs
 
     config['prettyName'] = config['prettyName'].lower() == 'true'
 
-    # Sanitize configs
     if 'version' not in config or 'versionCode' not in config:
         error('Config error: "version" and "versionCode" is required')
 
@@ -142,7 +159,7 @@ def load_config(args):
     except ValueError:
         error('Config error: "versionCode" is required to be an integer')
 
-    if args.release and not os.path.exists(config['keyStore']):
+    if args.release and not op.exists(config['keyStore']):
         error(f'Config error: assign "keyStore" to a java keystore')
 
     mkdir_p(config['outdir'])
@@ -151,7 +168,7 @@ def load_config(args):
 
 
 def zip_with_msg(zip_file, source, target):
-    if not os.path.exists(source):
+    if not op.exists(source):
         error(f'{source} does not exist! Try build \'binary\' and \'apk\' before zipping!')
     zip_file.write(source, target)
     vprint(f'zip: {source} -> {target}')
@@ -159,23 +176,23 @@ def zip_with_msg(zip_file, source, target):
 
 def collect_binary():
     for arch in archs + arch64:
-        mkdir_p(os.path.join('native', 'out', arch))
+        mkdir_p(op.join('native', 'out', arch))
         for bin in support_targets + ['magiskinit64']:
-            source = os.path.join('native', 'libs', arch, bin)
-            target = os.path.join('native', 'out', arch, bin)
+            source = op.join('native', 'libs', arch, bin)
+            target = op.join('native', 'out', arch, bin)
             mv(source, target)
 
 
 def clean_elf():
     if is_windows:
-        elf_cleaner = os.path.join('tools', 'elf-cleaner.exe')
+        elf_cleaner = op.join('tools', 'elf-cleaner.exe')
     else:
-        elf_cleaner = os.path.join('native', 'out', 'elf-cleaner')
-        if not os.path.exists(elf_cleaner):
+        elf_cleaner = op.join('native', 'out', 'elf-cleaner')
+        if not op.exists(elf_cleaner):
             execv(['g++', '-std=c++11', 'tools/termux-elf-cleaner/termux-elf-cleaner.cpp',
                   '-o', elf_cleaner])
     args = [elf_cleaner]
-    args.extend(os.path.join('native', 'out', arch, 'magisk') for arch in archs + arch64)
+    args.extend(op.join('native', 'out', arch, 'magisk') for arch in archs + arch64)
     execv(args)
 
 
@@ -185,9 +202,9 @@ def sign_zip(unsigned, output, release):
         return
 
     signer_name = 'zipsigner-3.0.jar'
-    zipsigner = os.path.join('signing', 'build', 'libs', signer_name)
+    zipsigner = op.join('signing', 'build', 'libs', signer_name)
 
-    if not os.path.exists(zipsigner):
+    if not op.exists(zipsigner):
         header('* Building ' + signer_name)
         proc = execv([gradlew, 'signing:shadowJar'])
         if proc.returncode != 0:
@@ -215,13 +232,13 @@ def binary_dump(src, out, var_name):
 def gen_update_binary():
     bs = 1024
     update_bin = bytearray(bs)
-    file = os.path.join('native', 'out', 'x86', 'busybox')
+    file = op.join('native', 'out', 'x86', 'busybox')
     with open(file, 'rb') as f:
         x86_bb = f.read()
-    file = os.path.join('native', 'out', 'armeabi-v7a', 'busybox')
+    file = op.join('native', 'out', 'armeabi-v7a', 'busybox')
     with open(file, 'rb') as f:
         arm_bb = f.read()
-    file = os.path.join('scripts', 'update_binary.sh')
+    file = op.join('scripts', 'update_binary.sh')
     with open(file, 'rb') as f:
         script = f.read()
     # Align x86 busybox to bs
@@ -244,28 +261,33 @@ def run_ndk_build(flags):
 
 def dump_bin_headers():
     for arch in archs:
-        bin_file = os.path.join('native', 'out', arch, 'magisk')
-        if not os.path.exists(bin_file):
+        bin_file = op.join('native', 'out', arch, 'magisk')
+        if not op.exists(bin_file):
             error('Build "magisk" before building "magiskinit"')
-        with open(os.path.join('native', 'out', arch, 'binaries_arch.h'), 'w') as out:
+        with open(op.join('native', 'out', arch, 'binaries_arch.h'), 'w') as out:
             with open(bin_file, 'rb') as src:
                 binary_dump(src, out, 'magisk_xz')
     for arch, arch32 in list(zip(arch64, archs)):
-        bin_file = os.path.join('native', 'out', arch, 'magisk')
-        with open(os.path.join('native', 'out', arch32, 'binaries_arch64.h'), 'w') as out:
+        bin_file = op.join('native', 'out', arch, 'magisk')
+        with open(op.join('native', 'out', arch32, 'binaries_arch64.h'), 'w') as out:
             with open(bin_file, 'rb') as src:
                 binary_dump(src, out, 'magisk_xz')
-    stub = os.path.join(config['outdir'], 'stub-release.apk')
-    if not os.path.exists(stub):
-        stub = os.path.join(config['outdir'], 'stub-debug.apk')
-        if not os.path.exists(stub):
+    stub = op.join(config['outdir'], 'stub-release.apk')
+    if not op.exists(stub):
+        stub = op.join(config['outdir'], 'stub-debug.apk')
+        if not op.exists(stub):
             error('Build stub APK before building "magiskinit"')
-    with open(os.path.join('native', 'out', 'binaries.h'), 'w') as out:
+    with open(op.join('native', 'out', 'binaries.h'), 'w') as out:
         with open(stub, 'rb') as src:
             binary_dump(src, out, 'manager_xz')
 
 
 def build_binary(args):
+    # Verify NDK install
+    props = parse_props(op.join(ndk_path, 'source.properties'))
+    if 'Pkg.Revision.orig' not in props or props['Pkg.Revision.orig'] != ndk_ver_full:
+        error('Incorrect NDK. Please setup NDK with "build.py ndk"')
+
     if args.target:
         args.target = set(args.target) & set(support_targets)
         if not args.target:
@@ -275,7 +297,7 @@ def build_binary(args):
 
     header('* Building binaries: ' + ' '.join(args.target))
 
-    os.utime(os.path.join('native', 'jni', 'include', 'flags.h'))
+    os.utime(op.join('native', 'jni', 'include', 'flags.h'))
 
     # Basic flags
     global base_flags
@@ -312,20 +334,20 @@ def build_apk(args, module):
     build_type = 'Release' if args.release else 'Debug'
 
     proc = execv([gradlew, f'{module}:assemble{build_type}',
-                 '-PconfigPath=' + os.path.abspath(args.config)])
+                 '-PconfigPath=' + op.abspath(args.config)])
     if proc.returncode != 0:
         error(f'Build {module} failed!')
 
     build_type = build_type.lower()
     apk = f'{module}-{build_type}.apk'
 
-    source = os.path.join(module, 'build', 'outputs', 'apk', build_type, apk)
-    target = os.path.join(config['outdir'], apk)
+    source = op.join(module, 'build', 'outputs', 'apk', build_type, apk)
+    target = op.join(config['outdir'], apk)
 
     if args.release:
-        zipalign = os.path.join(build_tools, 'zipalign' + ('.exe' if is_windows else ''))
-        aapt2 = os.path.join(build_tools, 'aapt2' + ('.exe' if is_windows else ''))
-        apksigner = os.path.join(build_tools, 'apksigner' + ('.bat' if is_windows else ''))
+        zipalign = op.join(build_tools, 'zipalign' + ('.exe' if is_windows else ''))
+        aapt2 = op.join(build_tools, 'aapt2' + ('.exe' if is_windows else ''))
+        apksigner = op.join(build_tools, 'apksigner' + ('.bat' if is_windows else ''))
         try:
             with tempfile.NamedTemporaryFile(delete=False) as f:
                 tmp = f.name
@@ -361,9 +383,9 @@ def build_apk(args, module):
 
 def build_app(args):
     header('* Building Magisk Manager')
-    source = os.path.join('scripts', 'util_functions.sh')
-    target = os.path.join('app', 'src', 'main',
-                          'res', 'raw', 'util_functions.sh')
+    source = op.join('scripts', 'util_functions.sh')
+    target = op.join('app', 'src', 'main',
+                     'res', 'raw', 'util_functions.sh')
     cp(source, target)
     build_apk(args, 'app')
 
@@ -378,9 +400,9 @@ def build_snet(args):
     proc = execv([gradlew, 'snet:assembleRelease'])
     if proc.returncode != 0:
         error('Build snet extention failed!')
-    source = os.path.join('snet', 'build', 'outputs', 'apk',
-                          'release', 'snet-release-unsigned.apk')
-    target = os.path.join(config['outdir'], 'snet.jar')
+    source = op.join('snet', 'build', 'outputs', 'apk',
+                     'release', 'snet-release-unsigned.apk')
+    target = op.join(config['outdir'], 'snet.jar')
     # Extract classes.dex
     with zipfile.ZipFile(target, 'w', compression=zipfile.ZIP_DEFLATED, allowZip64=False) as zout:
         with zipfile.ZipFile(source) as zin:
@@ -397,59 +419,59 @@ def zip_main(args):
 
     with zipfile.ZipFile(unsigned, 'w', compression=zipfile.ZIP_DEFLATED, allowZip64=False) as zipf:
         # update-binary
-        target = os.path.join('META-INF', 'com', 'google',
-                              'android', 'update-binary')
+        target = op.join('META-INF', 'com', 'google',
+                         'android', 'update-binary')
         vprint('zip: ' + target)
         zipf.writestr(target, gen_update_binary())
 
         # updater-script
-        source = os.path.join('scripts', 'flash_script.sh')
-        target = os.path.join('META-INF', 'com', 'google',
-                              'android', 'updater-script')
+        source = op.join('scripts', 'flash_script.sh')
+        target = op.join('META-INF', 'com', 'google',
+                         'android', 'updater-script')
         zip_with_msg(zipf, source, target)
 
         # Binaries
         for lib_dir, zip_dir in [('armeabi-v7a', 'arm'), ('x86', 'x86')]:
             for binary in ['magiskinit', 'magiskinit64', 'magiskboot']:
-                source = os.path.join('native', 'out', lib_dir, binary)
-                target = os.path.join(zip_dir, binary)
+                source = op.join('native', 'out', lib_dir, binary)
+                target = op.join(zip_dir, binary)
                 zip_with_msg(zipf, source, target)
 
         # APK
-        source = os.path.join(
+        source = op.join(
             config['outdir'], 'app-release.apk' if args.release else 'app-debug.apk')
-        target = os.path.join('common', 'magisk.apk')
+        target = op.join('common', 'magisk.apk')
         zip_with_msg(zipf, source, target)
 
         # boot_patch.sh
-        source = os.path.join('scripts', 'boot_patch.sh')
-        target = os.path.join('common', 'boot_patch.sh')
+        source = op.join('scripts', 'boot_patch.sh')
+        target = op.join('common', 'boot_patch.sh')
         zip_with_msg(zipf, source, target)
         # util_functions.sh
-        source = os.path.join('scripts', 'util_functions.sh')
+        source = op.join('scripts', 'util_functions.sh')
         with open(source, 'r') as script:
             # Add version info util_functions.sh
             util_func = script.read().replace(
                 '#MAGISK_VERSION_STUB',
                 f'MAGISK_VER="{config["version"]}"\nMAGISK_VER_CODE={config["versionCode"]}')
-            target = os.path.join('common', 'util_functions.sh')
+            target = op.join('common', 'util_functions.sh')
             vprint(f'zip: {source} -> {target}')
             zipf.writestr(target, util_func)
         # addon.d.sh
-        source = os.path.join('scripts', 'addon.d.sh')
-        target = os.path.join('common', 'addon.d.sh')
+        source = op.join('scripts', 'addon.d.sh')
+        target = op.join('common', 'addon.d.sh')
         zip_with_msg(zipf, source, target)
 
         # chromeos
         for tool in ['futility', 'kernel_data_key.vbprivk', 'kernel.keyblock']:
-            source = os.path.join('tools', tool)
-            target = os.path.join('chromeos', tool)
+            source = op.join('tools', tool)
+            target = op.join('chromeos', tool)
             zip_with_msg(zipf, source, target)
 
         # End of zipping
 
-    output = os.path.join(config['outdir'], f'Magisk-v{config["version"]}.zip' if config['prettyName'] else
-                          'magisk-release.zip' if args.release else 'magisk-debug.zip')
+    output = op.join(config['outdir'], f'Magisk-v{config["version"]}.zip' if config['prettyName'] else
+                     'magisk-release.zip' if args.release else 'magisk-debug.zip')
     sign_zip(unsigned, output, args.release)
     rm(unsigned)
     header('Output: ' + output)
@@ -463,40 +485,40 @@ def zip_uninstaller(args):
 
     with zipfile.ZipFile(unsigned, 'w', compression=zipfile.ZIP_DEFLATED, allowZip64=False) as zipf:
         # update-binary
-        target = os.path.join('META-INF', 'com', 'google',
-                              'android', 'update-binary')
+        target = op.join('META-INF', 'com', 'google',
+                         'android', 'update-binary')
         vprint('zip: ' + target)
         zipf.writestr(target, gen_update_binary())
         # updater-script
-        source = os.path.join('scripts', 'magisk_uninstaller.sh')
-        target = os.path.join('META-INF', 'com', 'google',
-                              'android', 'updater-script')
+        source = op.join('scripts', 'magisk_uninstaller.sh')
+        target = op.join('META-INF', 'com', 'google',
+                         'android', 'updater-script')
         zip_with_msg(zipf, source, target)
 
         # Binaries
         for lib_dir, zip_dir in [('armeabi-v7a', 'arm'), ('x86', 'x86')]:
-            source = os.path.join('native', 'out', lib_dir, 'magiskboot')
-            target = os.path.join(zip_dir, 'magiskboot')
+            source = op.join('native', 'out', lib_dir, 'magiskboot')
+            target = op.join(zip_dir, 'magiskboot')
             zip_with_msg(zipf, source, target)
 
         # util_functions.sh
-        source = os.path.join('scripts', 'util_functions.sh')
+        source = op.join('scripts', 'util_functions.sh')
         with open(source, 'r') as script:
-            target = os.path.join('util_functions.sh')
+            target = op.join('util_functions.sh')
             vprint(f'zip: {source} -> {target}')
             zipf.writestr(target, script.read())
 
         # chromeos
         for tool in ['futility', 'kernel_data_key.vbprivk', 'kernel.keyblock']:
-            source = os.path.join('tools', tool)
-            target = os.path.join('chromeos', tool)
+            source = op.join('tools', tool)
+            target = op.join('chromeos', tool)
             zip_with_msg(zipf, source, target)
 
         # End of zipping
 
     datestr = datetime.datetime.now().strftime("%Y%m%d")
-    output = os.path.join(config['outdir'], f'Magisk-uninstaller-{datestr}.zip'
-                          if config['prettyName'] else 'magisk-uninstaller.zip')
+    output = op.join(config['outdir'], f'Magisk-uninstaller-{datestr}.zip'
+                     if config['prettyName'] else 'magisk-uninstaller.zip')
     sign_zip(unsigned, output, args.release)
     rm(unsigned)
     header('Output: ' + output)
@@ -512,14 +534,66 @@ def cleanup(args):
 
     if 'native' in args.target:
         header('* Cleaning native')
-        system(ndk_build + ' -C native B_MAGISK=1 B_INIT=1 B_BOOT=1 B_BB=1 clean')
-        shutil.rmtree(os.path.join('native', 'out'), ignore_errors=True)
+        rm_rf(op.join('native', 'out'))
+        rm_rf(op.join('native', 'libs'))
+        rm_rf(op.join('native', 'obj'))
 
     if 'java' in args.target:
         header('* Cleaning java')
         execv([gradlew, 'clean'])
 
 
+def setup_ndk(args):
+    os_name = platform.system().lower()
+    url = f'https://dl.google.com/android/repository/android-ndk-r{ndk_ver}-{os_name}-x86_64.zip'
+    ndk_zip = url.split('/')[-1]
+
+    header(f'* Downloading {ndk_zip}')
+    with urllib.request.urlopen(url) as response, open(ndk_zip, 'wb') as out_file:
+        shutil.copyfileobj(response, out_file)
+
+    header('* Extracting NDK zip')
+    rm_rf(ndk_path)
+    with zipfile.ZipFile(ndk_zip, 'r') as zf:
+        for info in zf.infolist():
+            extracted_path = zf.extract(info, ndk_root)
+            vprint(f'Extracting {info.filename}')
+            if info.create_system == 3: # ZIP_UNIX_SYSTEM = 3
+                unix_attributes = info.external_attr >> 16
+            if unix_attributes:
+                os.chmod(extracted_path, unix_attributes)
+    mv(op.join(ndk_root, f'android-ndk-r{ndk_ver}'), ndk_path)
+
+    header('* Removing unnecessary files')
+    for dirname, subdirs, _ in os.walk(op.join(ndk_path, 'platforms')):
+        for plats in subdirs:
+            pp = op.join(dirname, plats)
+            rm_rf(pp)
+            mkdir(pp)
+        subdirs.clear()
+    rm_rf(op.join(ndk_path, 'sysroot'))
+
+    header('* Replacing API-16 static libs')
+    for arch in ['arm', 'i686']:
+      lib_dir = op.join(
+        ndk_path, 'toolchains', 'llvm', 'prebuilt', f'{os_name}-x86_64',
+        'sysroot', 'usr', 'lib', f'{arch}-linux-androideabi', '16')
+      src_dir = op.join('tools', 'ndk-bins', arch)
+      # Remove stupid macOS crap
+      rm(op.join(src_dir, '.DS_Store'))
+      for path in copy_tree(src_dir, lib_dir):
+          vprint(f'Replaced {path}')
+
+    # Rewrite source.properties
+    src_prop = op.join(ndk_path, 'source.properties')
+    props = parse_props(src_prop)
+    props['Pkg.Revision.orig'] = props['Pkg.Revision']
+    props['Pkg.Revision'] = '0.0.0'
+    with open(src_prop, 'w') as p:
+        for key, val in props.items():
+            print(f'{key} = {val}', file=p)
+
+
 def build_all(args):
     vars(args)['target'] = []
     build_stub(args)
@@ -572,6 +646,9 @@ clean_parser.add_argument(
     'target', nargs='*', help='native, java, or empty to clean both')
 clean_parser.set_defaults(func=cleanup)
 
+ndk_parser = subparsers.add_parser('ndk', help='setup Magisk NDK')
+ndk_parser.set_defaults(func=setup_ndk)
+
 if len(sys.argv) == 1:
     parser.print_help()
     sys.exit(1)
diff --git a/native/build.gradle b/native/build.gradle
index 0049d48d5..d3cd0fd31 100644
--- a/native/build.gradle
+++ b/native/build.gradle
@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 
 android {
 
+    ndkVersion '0.0.0'
+
     externalNativeBuild {
         ndkBuild {
             path 'jni/Android.mk'
diff --git a/tools/ndk-bins/README.md b/tools/ndk-bins/README.md
new file mode 100644
index 000000000..6216a7dee
Binary files /dev/null and b/tools/ndk-bins/README.md differ
diff --git a/tools/ndk-bins/arm/crtbegin_dynamic.o b/tools/ndk-bins/arm/crtbegin_dynamic.o
new file mode 100644
index 000000000..46556fb3f
Binary files /dev/null and b/tools/ndk-bins/arm/crtbegin_dynamic.o differ
diff --git a/tools/ndk-bins/arm/crtbegin_so.o b/tools/ndk-bins/arm/crtbegin_so.o
new file mode 100644
index 000000000..87062da77
Binary files /dev/null and b/tools/ndk-bins/arm/crtbegin_so.o differ
diff --git a/tools/ndk-bins/arm/crtbegin_static.o b/tools/ndk-bins/arm/crtbegin_static.o
new file mode 100644
index 000000000..6ff5ea907
Binary files /dev/null and b/tools/ndk-bins/arm/crtbegin_static.o differ
diff --git a/tools/ndk-bins/arm/crtend_android.o b/tools/ndk-bins/arm/crtend_android.o
new file mode 100644
index 000000000..d2d7b4ad5
Binary files /dev/null and b/tools/ndk-bins/arm/crtend_android.o differ
diff --git a/tools/ndk-bins/arm/crtend_so.o b/tools/ndk-bins/arm/crtend_so.o
new file mode 100644
index 000000000..e8a98e8ce
Binary files /dev/null and b/tools/ndk-bins/arm/crtend_so.o differ
diff --git a/tools/ndk-bins/arm/libc.a b/tools/ndk-bins/arm/libc.a
new file mode 100644
index 000000000..67ff8189e
Binary files /dev/null and b/tools/ndk-bins/arm/libc.a differ
diff --git a/tools/ndk-bins/arm/libm.a b/tools/ndk-bins/arm/libm.a
new file mode 100644
index 000000000..3e1ccb093
Binary files /dev/null and b/tools/ndk-bins/arm/libm.a differ
diff --git a/tools/ndk-bins/arm/libm_hard.a b/tools/ndk-bins/arm/libm_hard.a
new file mode 100644
index 000000000..1ab948ee5
Binary files /dev/null and b/tools/ndk-bins/arm/libm_hard.a differ
diff --git a/tools/ndk-bins/arm/libstdc++.a b/tools/ndk-bins/arm/libstdc++.a
new file mode 100644
index 000000000..8f495a5d0
Binary files /dev/null and b/tools/ndk-bins/arm/libstdc++.a differ
diff --git a/tools/ndk-bins/i686/crtbegin_dynamic.o b/tools/ndk-bins/i686/crtbegin_dynamic.o
new file mode 100644
index 000000000..53366dcb4
Binary files /dev/null and b/tools/ndk-bins/i686/crtbegin_dynamic.o differ
diff --git a/tools/ndk-bins/i686/crtbegin_so.o b/tools/ndk-bins/i686/crtbegin_so.o
new file mode 100644
index 000000000..1971da7fc
Binary files /dev/null and b/tools/ndk-bins/i686/crtbegin_so.o differ
diff --git a/tools/ndk-bins/i686/crtbegin_static.o b/tools/ndk-bins/i686/crtbegin_static.o
new file mode 100644
index 000000000..7f1a8d265
Binary files /dev/null and b/tools/ndk-bins/i686/crtbegin_static.o differ
diff --git a/tools/ndk-bins/i686/crtend_android.o b/tools/ndk-bins/i686/crtend_android.o
new file mode 100644
index 000000000..9c62fe09e
Binary files /dev/null and b/tools/ndk-bins/i686/crtend_android.o differ
diff --git a/tools/ndk-bins/i686/crtend_so.o b/tools/ndk-bins/i686/crtend_so.o
new file mode 100644
index 000000000..2c8850149
Binary files /dev/null and b/tools/ndk-bins/i686/crtend_so.o differ
diff --git a/tools/ndk-bins/i686/libc.a b/tools/ndk-bins/i686/libc.a
new file mode 100644
index 000000000..788b92e0d
Binary files /dev/null and b/tools/ndk-bins/i686/libc.a differ
diff --git a/tools/ndk-bins/i686/libm.a b/tools/ndk-bins/i686/libm.a
new file mode 100644
index 000000000..34f3c1f6d
Binary files /dev/null and b/tools/ndk-bins/i686/libm.a differ
diff --git a/tools/ndk-bins/i686/libstdc++.a b/tools/ndk-bins/i686/libstdc++.a
new file mode 100644
index 000000000..336bcfab8
Binary files /dev/null and b/tools/ndk-bins/i686/libstdc++.a differ
diff --git a/tools/ndk-bins/i686/libz.a b/tools/ndk-bins/i686/libz.a
new file mode 100644
index 000000000..5c91867c7
Binary files /dev/null and b/tools/ndk-bins/i686/libz.a differ