diff --git a/ndk/platforms/android-L/arch-arm/include/asm/a.out.h b/ndk/platforms/android-21/arch-arm/include/asm/a.out.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/a.out.h
rename to ndk/platforms/android-21/arch-arm/include/asm/a.out.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/auxvec.h b/ndk/platforms/android-21/arch-arm/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/auxvec.h
rename to ndk/platforms/android-21/arch-arm/include/asm/auxvec.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/bitsperlong.h b/ndk/platforms/android-21/arch-arm/include/asm/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/bitsperlong.h
rename to ndk/platforms/android-21/arch-arm/include/asm/bitsperlong.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/byteorder.h b/ndk/platforms/android-21/arch-arm/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/byteorder.h
rename to ndk/platforms/android-21/arch-arm/include/asm/byteorder.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/errno.h b/ndk/platforms/android-21/arch-arm/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/errno.h
rename to ndk/platforms/android-21/arch-arm/include/asm/errno.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/fcntl.h b/ndk/platforms/android-21/arch-arm/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/fcntl.h
rename to ndk/platforms/android-21/arch-arm/include/asm/fcntl.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/hwcap.h b/ndk/platforms/android-21/arch-arm/include/asm/hwcap.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/hwcap.h
rename to ndk/platforms/android-21/arch-arm/include/asm/hwcap.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/ioctl.h b/ndk/platforms/android-21/arch-arm/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/ioctl.h
rename to ndk/platforms/android-21/arch-arm/include/asm/ioctl.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/ioctls.h b/ndk/platforms/android-21/arch-arm/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/ioctls.h
rename to ndk/platforms/android-21/arch-arm/include/asm/ioctls.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/ipcbuf.h b/ndk/platforms/android-21/arch-arm/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/ipcbuf.h
rename to ndk/platforms/android-21/arch-arm/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/kvm.h b/ndk/platforms/android-21/arch-arm/include/asm/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/kvm.h
rename to ndk/platforms/android-21/arch-arm/include/asm/kvm.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/kvm_para.h b/ndk/platforms/android-21/arch-arm/include/asm/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/kvm_para.h
rename to ndk/platforms/android-21/arch-arm/include/asm/kvm_para.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/mman.h b/ndk/platforms/android-21/arch-arm/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/mman.h
rename to ndk/platforms/android-21/arch-arm/include/asm/mman.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/msgbuf.h b/ndk/platforms/android-21/arch-arm/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/msgbuf.h
rename to ndk/platforms/android-21/arch-arm/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/param.h b/ndk/platforms/android-21/arch-arm/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/param.h
rename to ndk/platforms/android-21/arch-arm/include/asm/param.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/perf_regs.h b/ndk/platforms/android-21/arch-arm/include/asm/perf_regs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/perf_regs.h
rename to ndk/platforms/android-21/arch-arm/include/asm/perf_regs.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/poll.h b/ndk/platforms/android-21/arch-arm/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/poll.h
rename to ndk/platforms/android-21/arch-arm/include/asm/poll.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/posix_types.h b/ndk/platforms/android-21/arch-arm/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/posix_types.h
rename to ndk/platforms/android-21/arch-arm/include/asm/posix_types.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/ptrace.h b/ndk/platforms/android-21/arch-arm/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/ptrace.h
rename to ndk/platforms/android-21/arch-arm/include/asm/ptrace.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/resource.h b/ndk/platforms/android-21/arch-arm/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/resource.h
rename to ndk/platforms/android-21/arch-arm/include/asm/resource.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/sembuf.h b/ndk/platforms/android-21/arch-arm/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/sembuf.h
rename to ndk/platforms/android-21/arch-arm/include/asm/sembuf.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/setup.h b/ndk/platforms/android-21/arch-arm/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/setup.h
rename to ndk/platforms/android-21/arch-arm/include/asm/setup.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/shmbuf.h b/ndk/platforms/android-21/arch-arm/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/shmbuf.h
rename to ndk/platforms/android-21/arch-arm/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/sigcontext.h b/ndk/platforms/android-21/arch-arm/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/sigcontext.h
rename to ndk/platforms/android-21/arch-arm/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/siginfo.h b/ndk/platforms/android-21/arch-arm/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/siginfo.h
rename to ndk/platforms/android-21/arch-arm/include/asm/siginfo.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/signal.h b/ndk/platforms/android-21/arch-arm/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/signal.h
rename to ndk/platforms/android-21/arch-arm/include/asm/signal.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/socket.h b/ndk/platforms/android-21/arch-arm/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/socket.h
rename to ndk/platforms/android-21/arch-arm/include/asm/socket.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/sockios.h b/ndk/platforms/android-21/arch-arm/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/sockios.h
rename to ndk/platforms/android-21/arch-arm/include/asm/sockios.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/stat.h b/ndk/platforms/android-21/arch-arm/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/stat.h
rename to ndk/platforms/android-21/arch-arm/include/asm/stat.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/statfs.h b/ndk/platforms/android-21/arch-arm/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/statfs.h
rename to ndk/platforms/android-21/arch-arm/include/asm/statfs.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/swab.h b/ndk/platforms/android-21/arch-arm/include/asm/swab.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/swab.h
rename to ndk/platforms/android-21/arch-arm/include/asm/swab.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/termbits.h b/ndk/platforms/android-21/arch-arm/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/termbits.h
rename to ndk/platforms/android-21/arch-arm/include/asm/termbits.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/termios.h b/ndk/platforms/android-21/arch-arm/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/termios.h
rename to ndk/platforms/android-21/arch-arm/include/asm/termios.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/types.h b/ndk/platforms/android-21/arch-arm/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/types.h
rename to ndk/platforms/android-21/arch-arm/include/asm/types.h
diff --git a/ndk/platforms/android-L/arch-arm/include/asm/unistd.h b/ndk/platforms/android-21/arch-arm/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/asm/unistd.h
rename to ndk/platforms/android-21/arch-arm/include/asm/unistd.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/asm.h b/ndk/platforms/android-21/arch-arm/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/asm.h
rename to ndk/platforms/android-21/arch-arm/include/machine/asm.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/cpu-features.h b/ndk/platforms/android-21/arch-arm/include/machine/cpu-features.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/cpu-features.h
rename to ndk/platforms/android-21/arch-arm/include/machine/cpu-features.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-arm/include/machine/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/elf_machdep.h
rename to ndk/platforms/android-21/arch-arm/include/machine/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/endian.h b/ndk/platforms/android-21/arch-arm/include/machine/endian.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/endian.h
rename to ndk/platforms/android-21/arch-arm/include/machine/endian.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/exec.h b/ndk/platforms/android-21/arch-arm/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/exec.h
rename to ndk/platforms/android-21/arch-arm/include/machine/exec.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/fenv.h b/ndk/platforms/android-21/arch-arm/include/machine/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/fenv.h
rename to ndk/platforms/android-21/arch-arm/include/machine/fenv.h
diff --git a/ndk/platforms/android-L/arch-arm/include/machine/setjmp.h b/ndk/platforms/android-21/arch-arm/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/include/machine/setjmp.h
rename to ndk/platforms/android-21/arch-arm/include/machine/setjmp.h
diff --git a/ndk/platforms/android-L/arch-arm/lib/libc.a b/ndk/platforms/android-21/arch-arm/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/lib/libc.a
rename to ndk/platforms/android-21/arch-arm/lib/libc.a
diff --git a/ndk/platforms/android-L/arch-arm/lib/libm.a b/ndk/platforms/android-21/arch-arm/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/lib/libm.a
rename to ndk/platforms/android-21/arch-arm/lib/libm.a
diff --git a/ndk/platforms/android-L/arch-arm/lib/libstdc++.a b/ndk/platforms/android-21/arch-arm/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/lib/libstdc++.a
rename to ndk/platforms/android-21/arch-arm/lib/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-arm/lib/libz.a b/ndk/platforms/android-21/arch-arm/lib/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/lib/libz.a
rename to ndk/platforms/android-21/arch-arm/lib/libz.a
diff --git a/ndk/platforms/android-L/arch-arm/src/__dso_handle.h b/ndk/platforms/android-21/arch-arm/src/__dso_handle.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/__dso_handle.h
rename to ndk/platforms/android-21/arch-arm/src/__dso_handle.h
diff --git a/ndk/platforms/android-L/arch-arm/src/__dso_handle_so.h b/ndk/platforms/android-21/arch-arm/src/__dso_handle_so.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/__dso_handle_so.h
rename to ndk/platforms/android-21/arch-arm/src/__dso_handle_so.h
diff --git a/ndk/platforms/android-L/arch-arm/src/atexit.h b/ndk/platforms/android-21/arch-arm/src/atexit.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/atexit.h
rename to ndk/platforms/android-21/arch-arm/src/atexit.h
diff --git a/ndk/platforms/android-L/arch-arm/src/crtbegin_dynamic.c b/ndk/platforms/android-21/arch-arm/src/crtbegin_dynamic.c
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/crtbegin_dynamic.c
rename to ndk/platforms/android-21/arch-arm/src/crtbegin_dynamic.c
diff --git a/ndk/platforms/android-L/arch-arm/src/crtbegin_so.c b/ndk/platforms/android-21/arch-arm/src/crtbegin_so.c
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/crtbegin_so.c
rename to ndk/platforms/android-21/arch-arm/src/crtbegin_so.c
diff --git a/ndk/platforms/android-L/arch-arm/src/crtbegin_static.c b/ndk/platforms/android-21/arch-arm/src/crtbegin_static.c
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/crtbegin_static.c
rename to ndk/platforms/android-21/arch-arm/src/crtbegin_static.c
diff --git a/ndk/platforms/android-L/arch-arm/src/crtend.S b/ndk/platforms/android-21/arch-arm/src/crtend.S
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/crtend.S
rename to ndk/platforms/android-21/arch-arm/src/crtend.S
diff --git a/ndk/platforms/android-L/arch-arm/src/crtend_so.S b/ndk/platforms/android-21/arch-arm/src/crtend_so.S
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/src/crtend_so.S
rename to ndk/platforms/android-21/arch-arm/src/crtend_so.S
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libGLESv3.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libGLESv3.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libOpenMAXAL.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libOpenMAXAL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libOpenMAXAL.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libOpenMAXAL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libOpenMAXAL.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libOpenMAXAL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libOpenMAXAL.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libOpenMAXAL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libOpenSLES.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libOpenSLES.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libOpenSLES.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libOpenSLES.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libOpenSLES.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libOpenSLES.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libOpenSLES.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libOpenSLES.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libandroid.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libandroid.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libandroid.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libandroid.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libandroid.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libandroid.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libandroid.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libandroid.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libc.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libc.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libc.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libc.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libdl.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libdl.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libdl.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libdl.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libdl.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libdl.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libdl.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libdl.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libjnigraphics.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libjnigraphics.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libjnigraphics.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libjnigraphics.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libjnigraphics.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libjnigraphics.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libjnigraphics.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libjnigraphics.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/liblog.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/liblog.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/liblog.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/liblog.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/liblog.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/liblog.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/liblog.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/liblog.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libm.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libm.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libm.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libm.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libm.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libm.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libm.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libm.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libmediandk.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libmediandk.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libmediandk.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libmediandk.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libmediandk.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libmediandk.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libstdc++.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libstdc++.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libstdc++.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libstdc++.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libstdc++.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libstdc++.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libstdc++.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libstdc++.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libz.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libz.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libz.so.functions.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libz.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm/symbols/libz.so.variables.txt b/ndk/platforms/android-21/arch-arm/symbols/libz.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm/symbols/libz.so.variables.txt
rename to ndk/platforms/android-21/arch-arm/symbols/libz.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/auxvec.h b/ndk/platforms/android-21/arch-arm64/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/auxvec.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/auxvec.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/bitsperlong.h b/ndk/platforms/android-21/arch-arm64/include/asm/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/bitsperlong.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/bitsperlong.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/byteorder.h b/ndk/platforms/android-21/arch-arm64/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/byteorder.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/byteorder.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/errno.h b/ndk/platforms/android-21/arch-arm64/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/errno.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/errno.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/fcntl.h b/ndk/platforms/android-21/arch-arm64/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/fcntl.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/fcntl.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/hwcap.h b/ndk/platforms/android-21/arch-arm64/include/asm/hwcap.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/hwcap.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/hwcap.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/ioctl.h b/ndk/platforms/android-21/arch-arm64/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/ioctl.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/ioctl.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/ioctls.h b/ndk/platforms/android-21/arch-arm64/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/ioctls.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/ioctls.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/ipcbuf.h b/ndk/platforms/android-21/arch-arm64/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/ipcbuf.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/kvm.h b/ndk/platforms/android-21/arch-arm64/include/asm/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/kvm.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/kvm.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/kvm_para.h b/ndk/platforms/android-21/arch-arm64/include/asm/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/kvm_para.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/kvm_para.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/mman.h b/ndk/platforms/android-21/arch-arm64/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/mman.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/mman.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/msgbuf.h b/ndk/platforms/android-21/arch-arm64/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/msgbuf.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/param.h b/ndk/platforms/android-21/arch-arm64/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/param.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/param.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/poll.h b/ndk/platforms/android-21/arch-arm64/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/poll.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/poll.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/posix_types.h b/ndk/platforms/android-21/arch-arm64/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/posix_types.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/posix_types.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/ptrace.h b/ndk/platforms/android-21/arch-arm64/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/ptrace.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/ptrace.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/resource.h b/ndk/platforms/android-21/arch-arm64/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/resource.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/resource.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/sembuf.h b/ndk/platforms/android-21/arch-arm64/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/sembuf.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/sembuf.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/setup.h b/ndk/platforms/android-21/arch-arm64/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/setup.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/setup.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/shmbuf.h b/ndk/platforms/android-21/arch-arm64/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/shmbuf.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/sigcontext.h b/ndk/platforms/android-21/arch-arm64/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/sigcontext.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/siginfo.h b/ndk/platforms/android-21/arch-arm64/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/siginfo.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/siginfo.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/signal.h b/ndk/platforms/android-21/arch-arm64/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/signal.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/signal.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/socket.h b/ndk/platforms/android-21/arch-arm64/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/socket.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/socket.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/sockios.h b/ndk/platforms/android-21/arch-arm64/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/sockios.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/sockios.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/stat.h b/ndk/platforms/android-21/arch-arm64/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/stat.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/stat.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/statfs.h b/ndk/platforms/android-21/arch-arm64/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/statfs.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/statfs.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/swab.h b/ndk/platforms/android-21/arch-arm64/include/asm/swab.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/swab.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/swab.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/termbits.h b/ndk/platforms/android-21/arch-arm64/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/termbits.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/termbits.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/termios.h b/ndk/platforms/android-21/arch-arm64/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/termios.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/termios.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/types.h b/ndk/platforms/android-21/arch-arm64/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/types.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/types.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/asm/unistd.h b/ndk/platforms/android-21/arch-arm64/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/asm/unistd.h
rename to ndk/platforms/android-21/arch-arm64/include/asm/unistd.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/machine/asm.h b/ndk/platforms/android-21/arch-arm64/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/machine/asm.h
rename to ndk/platforms/android-21/arch-arm64/include/machine/asm.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-arm64/include/machine/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/machine/elf_machdep.h
rename to ndk/platforms/android-21/arch-arm64/include/machine/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/machine/endian.h b/ndk/platforms/android-21/arch-arm64/include/machine/endian.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/machine/endian.h
rename to ndk/platforms/android-21/arch-arm64/include/machine/endian.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/machine/exec.h b/ndk/platforms/android-21/arch-arm64/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/machine/exec.h
rename to ndk/platforms/android-21/arch-arm64/include/machine/exec.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/machine/fenv.h b/ndk/platforms/android-21/arch-arm64/include/machine/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/machine/fenv.h
rename to ndk/platforms/android-21/arch-arm64/include/machine/fenv.h
diff --git a/ndk/platforms/android-L/arch-arm64/include/machine/setjmp.h b/ndk/platforms/android-21/arch-arm64/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/include/machine/setjmp.h
rename to ndk/platforms/android-21/arch-arm64/include/machine/setjmp.h
diff --git a/ndk/platforms/android-L/arch-arm64/lib-bootstrap/crtbegin_dynamic.o b/ndk/platforms/android-21/arch-arm64/lib-bootstrap/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib-bootstrap/crtbegin_dynamic.o
rename to ndk/platforms/android-21/arch-arm64/lib-bootstrap/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-L/arch-arm64/lib-bootstrap/crtend_android.o b/ndk/platforms/android-21/arch-arm64/lib-bootstrap/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib-bootstrap/crtend_android.o
rename to ndk/platforms/android-21/arch-arm64/lib-bootstrap/crtend_android.o
diff --git a/ndk/platforms/android-L/arch-arm64/lib-bootstrap/libc.so b/ndk/platforms/android-21/arch-arm64/lib-bootstrap/libc.so
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib-bootstrap/libc.so
rename to ndk/platforms/android-21/arch-arm64/lib-bootstrap/libc.so
diff --git a/ndk/platforms/android-L/arch-arm64/lib-bootstrap/libdl.so b/ndk/platforms/android-21/arch-arm64/lib-bootstrap/libdl.so
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib-bootstrap/libdl.so
rename to ndk/platforms/android-21/arch-arm64/lib-bootstrap/libdl.so
diff --git a/ndk/platforms/android-L/arch-arm64/lib/libc.a b/ndk/platforms/android-21/arch-arm64/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib/libc.a
rename to ndk/platforms/android-21/arch-arm64/lib/libc.a
diff --git a/ndk/platforms/android-L/arch-arm64/lib/libm.a b/ndk/platforms/android-21/arch-arm64/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib/libm.a
rename to ndk/platforms/android-21/arch-arm64/lib/libm.a
diff --git a/ndk/platforms/android-L/arch-arm64/lib/libstdc++.a b/ndk/platforms/android-21/arch-arm64/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib/libstdc++.a
rename to ndk/platforms/android-21/arch-arm64/lib/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-arm64/lib/libz.a b/ndk/platforms/android-21/arch-arm64/lib/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/lib/libz.a
rename to ndk/platforms/android-21/arch-arm64/lib/libz.a
diff --git a/ndk/platforms/android-L/arch-arm64/src/atexit.h b/ndk/platforms/android-21/arch-arm64/src/atexit.h
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/src/atexit.h
rename to ndk/platforms/android-21/arch-arm64/src/atexit.h
diff --git a/ndk/platforms/android-L/arch-arm64/src/crtbegin.c b/ndk/platforms/android-21/arch-arm64/src/crtbegin.c
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/src/crtbegin.c
rename to ndk/platforms/android-21/arch-arm64/src/crtbegin.c
diff --git a/ndk/platforms/android-L/arch-arm64/src/crtbegin_so.c b/ndk/platforms/android-21/arch-arm64/src/crtbegin_so.c
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/src/crtbegin_so.c
rename to ndk/platforms/android-21/arch-arm64/src/crtbegin_so.c
diff --git a/ndk/platforms/android-L/arch-arm64/src/crtend.S b/ndk/platforms/android-21/arch-arm64/src/crtend.S
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/src/crtend.S
rename to ndk/platforms/android-21/arch-arm64/src/crtend.S
diff --git a/ndk/platforms/android-L/arch-arm64/src/crtend_so.S b/ndk/platforms/android-21/arch-arm64/src/crtend_so.S
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/src/crtend_so.S
rename to ndk/platforms/android-21/arch-arm64/src/crtend_so.S
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libEGL.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libEGL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libEGL.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libEGL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libEGL.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libEGL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libEGL.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libEGL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libGLESv1_CM.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libGLESv1_CM.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libGLESv1_CM.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libGLESv1_CM.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libGLESv1_CM.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libGLESv1_CM.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libGLESv1_CM.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libGLESv1_CM.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libGLESv2.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libGLESv2.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libGLESv2.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libGLESv2.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libGLESv2.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libGLESv2.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libGLESv2.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libGLESv2.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libGLESv3.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libGLESv3.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libOpenMAXAL.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libOpenMAXAL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libOpenMAXAL.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libOpenMAXAL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libOpenMAXAL.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libOpenMAXAL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libOpenMAXAL.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libOpenMAXAL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libOpenSLES.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libOpenSLES.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libOpenSLES.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libOpenSLES.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libOpenSLES.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libOpenSLES.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libOpenSLES.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libOpenSLES.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libandroid.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libandroid.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libandroid.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libandroid.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libandroid.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libandroid.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libandroid.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libandroid.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libc.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libc.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libc.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libdl.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libdl.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libdl.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libdl.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libdl.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libdl.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libdl.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libdl.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libjnigraphics.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libjnigraphics.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libjnigraphics.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libjnigraphics.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libjnigraphics.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libjnigraphics.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libjnigraphics.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libjnigraphics.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/liblog.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/liblog.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/liblog.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/liblog.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/liblog.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/liblog.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/liblog.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/liblog.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libm.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libm.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libm.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libm.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libm.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libm.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libm.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libm.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libmediandk.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libmediandk.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libmediandk.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libmediandk.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libmediandk.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libmediandk.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libstdc++.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libstdc++.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libstdc++.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libstdc++.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libstdc++.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libstdc++.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libstdc++.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libstdc++.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libz.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libz.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libz.so.functions.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libz.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-arm64/symbols/libz.so.variables.txt b/ndk/platforms/android-21/arch-arm64/symbols/libz.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-arm64/symbols/libz.so.variables.txt
rename to ndk/platforms/android-21/arch-arm64/symbols/libz.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/auxvec.h b/ndk/platforms/android-21/arch-mips/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/auxvec.h
rename to ndk/platforms/android-21/arch-mips/include/asm/auxvec.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/bitsperlong.h b/ndk/platforms/android-21/arch-mips/include/asm/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/bitsperlong.h
rename to ndk/platforms/android-21/arch-mips/include/asm/bitsperlong.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/break.h b/ndk/platforms/android-21/arch-mips/include/asm/break.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/break.h
rename to ndk/platforms/android-21/arch-mips/include/asm/break.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/byteorder.h b/ndk/platforms/android-21/arch-mips/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/byteorder.h
rename to ndk/platforms/android-21/arch-mips/include/asm/byteorder.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/cachectl.h b/ndk/platforms/android-21/arch-mips/include/asm/cachectl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/cachectl.h
rename to ndk/platforms/android-21/arch-mips/include/asm/cachectl.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/errno.h b/ndk/platforms/android-21/arch-mips/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/errno.h
rename to ndk/platforms/android-21/arch-mips/include/asm/errno.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/fcntl.h b/ndk/platforms/android-21/arch-mips/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/fcntl.h
rename to ndk/platforms/android-21/arch-mips/include/asm/fcntl.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/inst.h b/ndk/platforms/android-21/arch-mips/include/asm/inst.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/inst.h
rename to ndk/platforms/android-21/arch-mips/include/asm/inst.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/ioctl.h b/ndk/platforms/android-21/arch-mips/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/ioctl.h
rename to ndk/platforms/android-21/arch-mips/include/asm/ioctl.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/ioctls.h b/ndk/platforms/android-21/arch-mips/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/ioctls.h
rename to ndk/platforms/android-21/arch-mips/include/asm/ioctls.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/ipcbuf.h b/ndk/platforms/android-21/arch-mips/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/ipcbuf.h
rename to ndk/platforms/android-21/arch-mips/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/kvm.h b/ndk/platforms/android-21/arch-mips/include/asm/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/kvm.h
rename to ndk/platforms/android-21/arch-mips/include/asm/kvm.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/kvm_para.h b/ndk/platforms/android-21/arch-mips/include/asm/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/kvm_para.h
rename to ndk/platforms/android-21/arch-mips/include/asm/kvm_para.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/mman.h b/ndk/platforms/android-21/arch-mips/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/mman.h
rename to ndk/platforms/android-21/arch-mips/include/asm/mman.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/msgbuf.h b/ndk/platforms/android-21/arch-mips/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/msgbuf.h
rename to ndk/platforms/android-21/arch-mips/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/param.h b/ndk/platforms/android-21/arch-mips/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/param.h
rename to ndk/platforms/android-21/arch-mips/include/asm/param.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/poll.h b/ndk/platforms/android-21/arch-mips/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/poll.h
rename to ndk/platforms/android-21/arch-mips/include/asm/poll.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/posix_types.h b/ndk/platforms/android-21/arch-mips/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/posix_types.h
rename to ndk/platforms/android-21/arch-mips/include/asm/posix_types.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/ptrace.h b/ndk/platforms/android-21/arch-mips/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/ptrace.h
rename to ndk/platforms/android-21/arch-mips/include/asm/ptrace.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/resource.h b/ndk/platforms/android-21/arch-mips/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/resource.h
rename to ndk/platforms/android-21/arch-mips/include/asm/resource.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/sembuf.h b/ndk/platforms/android-21/arch-mips/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/sembuf.h
rename to ndk/platforms/android-21/arch-mips/include/asm/sembuf.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/setup.h b/ndk/platforms/android-21/arch-mips/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/setup.h
rename to ndk/platforms/android-21/arch-mips/include/asm/setup.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/sgidefs.h b/ndk/platforms/android-21/arch-mips/include/asm/sgidefs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/sgidefs.h
rename to ndk/platforms/android-21/arch-mips/include/asm/sgidefs.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/shmbuf.h b/ndk/platforms/android-21/arch-mips/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/shmbuf.h
rename to ndk/platforms/android-21/arch-mips/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/sigcontext.h b/ndk/platforms/android-21/arch-mips/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/sigcontext.h
rename to ndk/platforms/android-21/arch-mips/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/siginfo.h b/ndk/platforms/android-21/arch-mips/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/siginfo.h
rename to ndk/platforms/android-21/arch-mips/include/asm/siginfo.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/signal.h b/ndk/platforms/android-21/arch-mips/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/signal.h
rename to ndk/platforms/android-21/arch-mips/include/asm/signal.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/socket.h b/ndk/platforms/android-21/arch-mips/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/socket.h
rename to ndk/platforms/android-21/arch-mips/include/asm/socket.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/sockios.h b/ndk/platforms/android-21/arch-mips/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/sockios.h
rename to ndk/platforms/android-21/arch-mips/include/asm/sockios.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/stat.h b/ndk/platforms/android-21/arch-mips/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/stat.h
rename to ndk/platforms/android-21/arch-mips/include/asm/stat.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/statfs.h b/ndk/platforms/android-21/arch-mips/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/statfs.h
rename to ndk/platforms/android-21/arch-mips/include/asm/statfs.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/swab.h b/ndk/platforms/android-21/arch-mips/include/asm/swab.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/swab.h
rename to ndk/platforms/android-21/arch-mips/include/asm/swab.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/sysmips.h b/ndk/platforms/android-21/arch-mips/include/asm/sysmips.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/sysmips.h
rename to ndk/platforms/android-21/arch-mips/include/asm/sysmips.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/termbits.h b/ndk/platforms/android-21/arch-mips/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/termbits.h
rename to ndk/platforms/android-21/arch-mips/include/asm/termbits.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/termios.h b/ndk/platforms/android-21/arch-mips/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/termios.h
rename to ndk/platforms/android-21/arch-mips/include/asm/termios.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/types.h b/ndk/platforms/android-21/arch-mips/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/types.h
rename to ndk/platforms/android-21/arch-mips/include/asm/types.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/ucontext.h b/ndk/platforms/android-21/arch-mips/include/asm/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/ucontext.h
rename to ndk/platforms/android-21/arch-mips/include/asm/ucontext.h
diff --git a/ndk/platforms/android-L/arch-mips/include/asm/unistd.h b/ndk/platforms/android-21/arch-mips/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/asm/unistd.h
rename to ndk/platforms/android-21/arch-mips/include/asm/unistd.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/asm.h b/ndk/platforms/android-21/arch-mips/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/asm.h
rename to ndk/platforms/android-21/arch-mips/include/machine/asm.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-mips/include/machine/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/elf_machdep.h
rename to ndk/platforms/android-21/arch-mips/include/machine/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/endian.h b/ndk/platforms/android-21/arch-mips/include/machine/endian.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/endian.h
rename to ndk/platforms/android-21/arch-mips/include/machine/endian.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/exec.h b/ndk/platforms/android-21/arch-mips/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/exec.h
rename to ndk/platforms/android-21/arch-mips/include/machine/exec.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/fenv.h b/ndk/platforms/android-21/arch-mips/include/machine/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/fenv.h
rename to ndk/platforms/android-21/arch-mips/include/machine/fenv.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/regdef.h b/ndk/platforms/android-21/arch-mips/include/machine/regdef.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/regdef.h
rename to ndk/platforms/android-21/arch-mips/include/machine/regdef.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/regnum.h b/ndk/platforms/android-21/arch-mips/include/machine/regnum.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/regnum.h
rename to ndk/platforms/android-21/arch-mips/include/machine/regnum.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/setjmp.h b/ndk/platforms/android-21/arch-mips/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/setjmp.h
rename to ndk/platforms/android-21/arch-mips/include/machine/setjmp.h
diff --git a/ndk/platforms/android-L/arch-mips/include/machine/signal.h b/ndk/platforms/android-21/arch-mips/include/machine/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/include/machine/signal.h
rename to ndk/platforms/android-21/arch-mips/include/machine/signal.h
diff --git a/ndk/platforms/android-L/arch-mips/lib/libc.a b/ndk/platforms/android-21/arch-mips/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/lib/libc.a
rename to ndk/platforms/android-21/arch-mips/lib/libc.a
diff --git a/ndk/platforms/android-L/arch-mips/lib/libm.a b/ndk/platforms/android-21/arch-mips/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/lib/libm.a
rename to ndk/platforms/android-21/arch-mips/lib/libm.a
diff --git a/ndk/platforms/android-L/arch-mips/lib/libstdc++.a b/ndk/platforms/android-21/arch-mips/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/lib/libstdc++.a
rename to ndk/platforms/android-21/arch-mips/lib/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-mips/lib/libz.a b/ndk/platforms/android-21/arch-mips/lib/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/lib/libz.a
rename to ndk/platforms/android-21/arch-mips/lib/libz.a
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libGLESv3.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libGLESv3.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libOpenMAXAL.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libOpenMAXAL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libOpenMAXAL.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libOpenMAXAL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libOpenMAXAL.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libOpenMAXAL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libOpenMAXAL.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libOpenMAXAL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libOpenSLES.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libOpenSLES.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libOpenSLES.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libOpenSLES.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libOpenSLES.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libOpenSLES.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libOpenSLES.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libOpenSLES.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libandroid.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libandroid.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libandroid.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libandroid.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libandroid.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libandroid.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libandroid.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libandroid.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libc.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libc.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libc.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libc.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libdl.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libdl.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libdl.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libdl.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libdl.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libdl.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libdl.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libdl.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libjnigraphics.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libjnigraphics.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libjnigraphics.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libjnigraphics.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libjnigraphics.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libjnigraphics.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libjnigraphics.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libjnigraphics.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/liblog.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/liblog.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/liblog.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/liblog.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/liblog.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/liblog.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/liblog.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/liblog.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libm.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libm.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libm.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libm.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libm.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libm.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libm.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libm.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libmediandk.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libmediandk.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libmediandk.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libmediandk.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libmediandk.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libmediandk.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libstdc++.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libstdc++.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libstdc++.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libstdc++.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libstdc++.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libstdc++.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libstdc++.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libstdc++.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libz.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libz.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libz.so.functions.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libz.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips/symbols/libz.so.variables.txt b/ndk/platforms/android-21/arch-mips/symbols/libz.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips/symbols/libz.so.variables.txt
rename to ndk/platforms/android-21/arch-mips/symbols/libz.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/auxvec.h b/ndk/platforms/android-21/arch-mips64/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/auxvec.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/auxvec.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/bitsperlong.h b/ndk/platforms/android-21/arch-mips64/include/asm/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/bitsperlong.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/bitsperlong.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/break.h b/ndk/platforms/android-21/arch-mips64/include/asm/break.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/break.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/break.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/byteorder.h b/ndk/platforms/android-21/arch-mips64/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/byteorder.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/byteorder.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/cachectl.h b/ndk/platforms/android-21/arch-mips64/include/asm/cachectl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/cachectl.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/cachectl.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/errno.h b/ndk/platforms/android-21/arch-mips64/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/errno.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/errno.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/fcntl.h b/ndk/platforms/android-21/arch-mips64/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/fcntl.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/fcntl.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/inst.h b/ndk/platforms/android-21/arch-mips64/include/asm/inst.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/inst.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/inst.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/ioctl.h b/ndk/platforms/android-21/arch-mips64/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/ioctl.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/ioctl.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/ioctls.h b/ndk/platforms/android-21/arch-mips64/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/ioctls.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/ioctls.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/ipcbuf.h b/ndk/platforms/android-21/arch-mips64/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/ipcbuf.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/kvm.h b/ndk/platforms/android-21/arch-mips64/include/asm/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/kvm.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/kvm.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/kvm_para.h b/ndk/platforms/android-21/arch-mips64/include/asm/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/kvm_para.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/kvm_para.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/mman.h b/ndk/platforms/android-21/arch-mips64/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/mman.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/mman.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/msgbuf.h b/ndk/platforms/android-21/arch-mips64/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/msgbuf.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/param.h b/ndk/platforms/android-21/arch-mips64/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/param.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/param.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/poll.h b/ndk/platforms/android-21/arch-mips64/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/poll.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/poll.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/posix_types.h b/ndk/platforms/android-21/arch-mips64/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/posix_types.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/posix_types.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/ptrace.h b/ndk/platforms/android-21/arch-mips64/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/ptrace.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/ptrace.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/resource.h b/ndk/platforms/android-21/arch-mips64/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/resource.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/resource.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/sembuf.h b/ndk/platforms/android-21/arch-mips64/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/sembuf.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/sembuf.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/setup.h b/ndk/platforms/android-21/arch-mips64/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/setup.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/setup.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/sgidefs.h b/ndk/platforms/android-21/arch-mips64/include/asm/sgidefs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/sgidefs.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/sgidefs.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/shmbuf.h b/ndk/platforms/android-21/arch-mips64/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/shmbuf.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/sigcontext.h b/ndk/platforms/android-21/arch-mips64/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/sigcontext.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/siginfo.h b/ndk/platforms/android-21/arch-mips64/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/siginfo.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/siginfo.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/signal.h b/ndk/platforms/android-21/arch-mips64/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/signal.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/signal.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/socket.h b/ndk/platforms/android-21/arch-mips64/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/socket.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/socket.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/sockios.h b/ndk/platforms/android-21/arch-mips64/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/sockios.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/sockios.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/stat.h b/ndk/platforms/android-21/arch-mips64/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/stat.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/stat.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/statfs.h b/ndk/platforms/android-21/arch-mips64/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/statfs.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/statfs.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/swab.h b/ndk/platforms/android-21/arch-mips64/include/asm/swab.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/swab.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/swab.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/sysmips.h b/ndk/platforms/android-21/arch-mips64/include/asm/sysmips.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/sysmips.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/sysmips.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/termbits.h b/ndk/platforms/android-21/arch-mips64/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/termbits.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/termbits.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/termios.h b/ndk/platforms/android-21/arch-mips64/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/termios.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/termios.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/types.h b/ndk/platforms/android-21/arch-mips64/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/types.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/types.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/ucontext.h b/ndk/platforms/android-21/arch-mips64/include/asm/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/ucontext.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/ucontext.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/asm/unistd.h b/ndk/platforms/android-21/arch-mips64/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/asm/unistd.h
rename to ndk/platforms/android-21/arch-mips64/include/asm/unistd.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/asm.h b/ndk/platforms/android-21/arch-mips64/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/asm.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/asm.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-mips64/include/machine/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/elf_machdep.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/endian.h b/ndk/platforms/android-21/arch-mips64/include/machine/endian.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/endian.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/endian.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/exec.h b/ndk/platforms/android-21/arch-mips64/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/exec.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/exec.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/fenv.h b/ndk/platforms/android-21/arch-mips64/include/machine/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/fenv.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/fenv.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/regdef.h b/ndk/platforms/android-21/arch-mips64/include/machine/regdef.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/regdef.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/regdef.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/regnum.h b/ndk/platforms/android-21/arch-mips64/include/machine/regnum.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/regnum.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/regnum.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/setjmp.h b/ndk/platforms/android-21/arch-mips64/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/setjmp.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/setjmp.h
diff --git a/ndk/platforms/android-L/arch-mips64/include/machine/signal.h b/ndk/platforms/android-21/arch-mips64/include/machine/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/include/machine/signal.h
rename to ndk/platforms/android-21/arch-mips64/include/machine/signal.h
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtend_android.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/crtend_android.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/crtend_android.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libc.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/libc.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libc.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/libc.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libdl.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/libdl.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib/libdl.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib/libdl.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtend_android.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/crtend_android.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/crtend_android.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libc.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/libc.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libc.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/libc.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libdl.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/libdl.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64/libdl.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64/libdl.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/crtend_android.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libc.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/libc.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libc.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/libc.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libdl.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/libdl.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/lib64r2/libdl.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/lib64r2/libdl.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtend_android.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/crtend_android.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/crtend_android.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libc.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/libc.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libc.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/libc.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libdl.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/libdl.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr2/libdl.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr2/libdl.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/crtbegin_dynamic.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtend_android.o b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/crtend_android.o
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/crtend_android.o
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/crtend_android.o
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libc.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/libc.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libc.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/libc.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libdl.so b/ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/libdl.so
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib-bootstrap/libr6/libdl.so
rename to ndk/platforms/android-21/arch-mips64/lib-bootstrap/libr6/libdl.so
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libc.a b/ndk/platforms/android-21/arch-mips64/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib/libc.a
rename to ndk/platforms/android-21/arch-mips64/lib/libc.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libm.a b/ndk/platforms/android-21/arch-mips64/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib/libm.a
rename to ndk/platforms/android-21/arch-mips64/lib/libm.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-21/arch-mips64/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib/libstdc++.a
rename to ndk/platforms/android-21/arch-mips64/lib/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib/libz.a b/ndk/platforms/android-21/arch-mips64/lib/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib/libz.a
rename to ndk/platforms/android-21/arch-mips64/lib/libz.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libc.a b/ndk/platforms/android-21/arch-mips64/lib64/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64/libc.a
rename to ndk/platforms/android-21/arch-mips64/lib64/libc.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libm.a b/ndk/platforms/android-21/arch-mips64/lib64/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64/libm.a
rename to ndk/platforms/android-21/arch-mips64/lib64/libm.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a b/ndk/platforms/android-21/arch-mips64/lib64/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64/libstdc++.a
rename to ndk/platforms/android-21/arch-mips64/lib64/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64/libz.a b/ndk/platforms/android-21/arch-mips64/lib64/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64/libz.a
rename to ndk/platforms/android-21/arch-mips64/lib64/libz.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libc.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64r2/libc.a
rename to ndk/platforms/android-21/arch-mips64/lib64r2/libc.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libm.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64r2/libm.a
rename to ndk/platforms/android-21/arch-mips64/lib64r2/libm.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libstdc++.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64r2/libstdc++.a
rename to ndk/platforms/android-21/arch-mips64/lib64r2/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-mips64/lib64r2/libz.a b/ndk/platforms/android-21/arch-mips64/lib64r2/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/lib64r2/libz.a
rename to ndk/platforms/android-21/arch-mips64/lib64r2/libz.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libc.a b/ndk/platforms/android-21/arch-mips64/libr2/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr2/libc.a
rename to ndk/platforms/android-21/arch-mips64/libr2/libc.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libm.a b/ndk/platforms/android-21/arch-mips64/libr2/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr2/libm.a
rename to ndk/platforms/android-21/arch-mips64/libr2/libm.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libstdc++.a b/ndk/platforms/android-21/arch-mips64/libr2/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr2/libstdc++.a
rename to ndk/platforms/android-21/arch-mips64/libr2/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr2/libz.a b/ndk/platforms/android-21/arch-mips64/libr2/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr2/libz.a
rename to ndk/platforms/android-21/arch-mips64/libr2/libz.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libc.a b/ndk/platforms/android-21/arch-mips64/libr6/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr6/libc.a
rename to ndk/platforms/android-21/arch-mips64/libr6/libc.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libm.a b/ndk/platforms/android-21/arch-mips64/libr6/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr6/libm.a
rename to ndk/platforms/android-21/arch-mips64/libr6/libm.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libstdc++.a b/ndk/platforms/android-21/arch-mips64/libr6/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr6/libstdc++.a
rename to ndk/platforms/android-21/arch-mips64/libr6/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-mips64/libr6/libz.a b/ndk/platforms/android-21/arch-mips64/libr6/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/libr6/libz.a
rename to ndk/platforms/android-21/arch-mips64/libr6/libz.a
diff --git a/ndk/platforms/android-L/arch-mips64/src/atexit.h b/ndk/platforms/android-21/arch-mips64/src/atexit.h
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/src/atexit.h
rename to ndk/platforms/android-21/arch-mips64/src/atexit.h
diff --git a/ndk/platforms/android-L/arch-mips64/src/crtbegin.c b/ndk/platforms/android-21/arch-mips64/src/crtbegin.c
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/src/crtbegin.c
rename to ndk/platforms/android-21/arch-mips64/src/crtbegin.c
diff --git a/ndk/platforms/android-L/arch-mips64/src/crtbegin_so.c b/ndk/platforms/android-21/arch-mips64/src/crtbegin_so.c
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/src/crtbegin_so.c
rename to ndk/platforms/android-21/arch-mips64/src/crtbegin_so.c
diff --git a/ndk/platforms/android-L/arch-mips64/src/crtend_android.S b/ndk/platforms/android-21/arch-mips64/src/crtend_android.S
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/src/crtend_android.S
rename to ndk/platforms/android-21/arch-mips64/src/crtend_android.S
diff --git a/ndk/platforms/android-L/arch-mips64/src/crtend_so.S b/ndk/platforms/android-21/arch-mips64/src/crtend_so.S
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/src/crtend_so.S
rename to ndk/platforms/android-21/arch-mips64/src/crtend_so.S
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libEGL.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libEGL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libEGL.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libEGL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libEGL.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libEGL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libEGL.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libEGL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libGLESv1_CM.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libGLESv1_CM.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libGLESv1_CM.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libGLESv1_CM.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libGLESv1_CM.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libGLESv1_CM.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libGLESv1_CM.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libGLESv1_CM.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libGLESv2.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libGLESv2.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libGLESv2.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libGLESv2.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libGLESv2.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libGLESv2.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libGLESv2.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libGLESv2.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libGLESv3.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libGLESv3.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libOpenMAXAL.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libOpenMAXAL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libOpenMAXAL.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libOpenMAXAL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libOpenMAXAL.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libOpenMAXAL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libOpenMAXAL.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libOpenMAXAL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libOpenSLES.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libOpenSLES.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libOpenSLES.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libOpenSLES.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libOpenSLES.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libOpenSLES.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libOpenSLES.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libOpenSLES.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libandroid.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libandroid.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libandroid.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libandroid.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libandroid.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libandroid.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libandroid.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libandroid.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libc.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libc.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libc.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libdl.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libdl.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libdl.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libdl.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libdl.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libdl.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libdl.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libdl.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libjnigraphics.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libjnigraphics.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libjnigraphics.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libjnigraphics.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libjnigraphics.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libjnigraphics.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libjnigraphics.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libjnigraphics.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/liblog.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/liblog.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/liblog.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/liblog.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/liblog.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/liblog.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/liblog.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/liblog.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libm.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libm.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libm.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libm.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libm.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libm.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libm.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libm.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libmediandk.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libmediandk.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libmediandk.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libmediandk.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libmediandk.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libmediandk.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libstdc++.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libstdc++.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libstdc++.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libstdc++.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libstdc++.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libstdc++.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libstdc++.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libstdc++.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libz.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libz.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libz.so.functions.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libz.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-mips64/symbols/libz.so.variables.txt b/ndk/platforms/android-21/arch-mips64/symbols/libz.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-mips64/symbols/libz.so.variables.txt
rename to ndk/platforms/android-21/arch-mips64/symbols/libz.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/a.out.h b/ndk/platforms/android-21/arch-x86/include/asm/a.out.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/a.out.h
rename to ndk/platforms/android-21/arch-x86/include/asm/a.out.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/auxvec.h b/ndk/platforms/android-21/arch-x86/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/auxvec.h
rename to ndk/platforms/android-21/arch-x86/include/asm/auxvec.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/bitsperlong.h b/ndk/platforms/android-21/arch-x86/include/asm/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/bitsperlong.h
rename to ndk/platforms/android-21/arch-x86/include/asm/bitsperlong.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/boot.h b/ndk/platforms/android-21/arch-x86/include/asm/boot.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/boot.h
rename to ndk/platforms/android-21/arch-x86/include/asm/boot.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/bootparam.h b/ndk/platforms/android-21/arch-x86/include/asm/bootparam.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/bootparam.h
rename to ndk/platforms/android-21/arch-x86/include/asm/bootparam.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/byteorder.h b/ndk/platforms/android-21/arch-x86/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/byteorder.h
rename to ndk/platforms/android-21/arch-x86/include/asm/byteorder.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/debugreg.h b/ndk/platforms/android-21/arch-x86/include/asm/debugreg.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/debugreg.h
rename to ndk/platforms/android-21/arch-x86/include/asm/debugreg.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/e820.h b/ndk/platforms/android-21/arch-x86/include/asm/e820.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/e820.h
rename to ndk/platforms/android-21/arch-x86/include/asm/e820.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/errno.h b/ndk/platforms/android-21/arch-x86/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/errno.h
rename to ndk/platforms/android-21/arch-x86/include/asm/errno.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/fcntl.h b/ndk/platforms/android-21/arch-x86/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/fcntl.h
rename to ndk/platforms/android-21/arch-x86/include/asm/fcntl.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/hw_breakpoint.h b/ndk/platforms/android-21/arch-x86/include/asm/hw_breakpoint.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/hw_breakpoint.h
rename to ndk/platforms/android-21/arch-x86/include/asm/hw_breakpoint.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/hyperv.h b/ndk/platforms/android-21/arch-x86/include/asm/hyperv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/hyperv.h
rename to ndk/platforms/android-21/arch-x86/include/asm/hyperv.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ioctl.h b/ndk/platforms/android-21/arch-x86/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ioctl.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ioctl.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ioctls.h b/ndk/platforms/android-21/arch-x86/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ioctls.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ioctls.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ipcbuf.h b/ndk/platforms/android-21/arch-x86/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ipcbuf.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ist.h b/ndk/platforms/android-21/arch-x86/include/asm/ist.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ist.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ist.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/kvm.h b/ndk/platforms/android-21/arch-x86/include/asm/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/kvm.h
rename to ndk/platforms/android-21/arch-x86/include/asm/kvm.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/kvm_para.h b/ndk/platforms/android-21/arch-x86/include/asm/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/kvm_para.h
rename to ndk/platforms/android-21/arch-x86/include/asm/kvm_para.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ldt.h b/ndk/platforms/android-21/arch-x86/include/asm/ldt.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ldt.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ldt.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/mce.h b/ndk/platforms/android-21/arch-x86/include/asm/mce.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/mce.h
rename to ndk/platforms/android-21/arch-x86/include/asm/mce.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/mman.h b/ndk/platforms/android-21/arch-x86/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/mman.h
rename to ndk/platforms/android-21/arch-x86/include/asm/mman.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/msgbuf.h b/ndk/platforms/android-21/arch-x86/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/msgbuf.h
rename to ndk/platforms/android-21/arch-x86/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/msr-index.h b/ndk/platforms/android-21/arch-x86/include/asm/msr-index.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/msr-index.h
rename to ndk/platforms/android-21/arch-x86/include/asm/msr-index.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/msr.h b/ndk/platforms/android-21/arch-x86/include/asm/msr.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/msr.h
rename to ndk/platforms/android-21/arch-x86/include/asm/msr.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/mtrr.h b/ndk/platforms/android-21/arch-x86/include/asm/mtrr.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/mtrr.h
rename to ndk/platforms/android-21/arch-x86/include/asm/mtrr.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/param.h b/ndk/platforms/android-21/arch-x86/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/param.h
rename to ndk/platforms/android-21/arch-x86/include/asm/param.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/perf_regs.h b/ndk/platforms/android-21/arch-x86/include/asm/perf_regs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/perf_regs.h
rename to ndk/platforms/android-21/arch-x86/include/asm/perf_regs.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/poll.h b/ndk/platforms/android-21/arch-x86/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/poll.h
rename to ndk/platforms/android-21/arch-x86/include/asm/poll.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/posix_types.h b/ndk/platforms/android-21/arch-x86/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/posix_types.h
rename to ndk/platforms/android-21/arch-x86/include/asm/posix_types.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/posix_types_32.h b/ndk/platforms/android-21/arch-x86/include/asm/posix_types_32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/posix_types_32.h
rename to ndk/platforms/android-21/arch-x86/include/asm/posix_types_32.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/posix_types_64.h b/ndk/platforms/android-21/arch-x86/include/asm/posix_types_64.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/posix_types_64.h
rename to ndk/platforms/android-21/arch-x86/include/asm/posix_types_64.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/posix_types_x32.h b/ndk/platforms/android-21/arch-x86/include/asm/posix_types_x32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/posix_types_x32.h
rename to ndk/platforms/android-21/arch-x86/include/asm/posix_types_x32.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/prctl.h b/ndk/platforms/android-21/arch-x86/include/asm/prctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/prctl.h
rename to ndk/platforms/android-21/arch-x86/include/asm/prctl.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/processor-flags.h b/ndk/platforms/android-21/arch-x86/include/asm/processor-flags.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/processor-flags.h
rename to ndk/platforms/android-21/arch-x86/include/asm/processor-flags.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ptrace-abi.h b/ndk/platforms/android-21/arch-x86/include/asm/ptrace-abi.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ptrace-abi.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ptrace-abi.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ptrace.h b/ndk/platforms/android-21/arch-x86/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ptrace.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ptrace.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/resource.h b/ndk/platforms/android-21/arch-x86/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/resource.h
rename to ndk/platforms/android-21/arch-x86/include/asm/resource.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/sembuf.h b/ndk/platforms/android-21/arch-x86/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/sembuf.h
rename to ndk/platforms/android-21/arch-x86/include/asm/sembuf.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/setup.h b/ndk/platforms/android-21/arch-x86/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/setup.h
rename to ndk/platforms/android-21/arch-x86/include/asm/setup.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/shmbuf.h b/ndk/platforms/android-21/arch-x86/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/shmbuf.h
rename to ndk/platforms/android-21/arch-x86/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/sigcontext.h b/ndk/platforms/android-21/arch-x86/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/sigcontext.h
rename to ndk/platforms/android-21/arch-x86/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/sigcontext32.h b/ndk/platforms/android-21/arch-x86/include/asm/sigcontext32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/sigcontext32.h
rename to ndk/platforms/android-21/arch-x86/include/asm/sigcontext32.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/siginfo.h b/ndk/platforms/android-21/arch-x86/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/siginfo.h
rename to ndk/platforms/android-21/arch-x86/include/asm/siginfo.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/signal.h b/ndk/platforms/android-21/arch-x86/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/signal.h
rename to ndk/platforms/android-21/arch-x86/include/asm/signal.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/socket.h b/ndk/platforms/android-21/arch-x86/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/socket.h
rename to ndk/platforms/android-21/arch-x86/include/asm/socket.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/sockios.h b/ndk/platforms/android-21/arch-x86/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/sockios.h
rename to ndk/platforms/android-21/arch-x86/include/asm/sockios.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/stat.h b/ndk/platforms/android-21/arch-x86/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/stat.h
rename to ndk/platforms/android-21/arch-x86/include/asm/stat.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/statfs.h b/ndk/platforms/android-21/arch-x86/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/statfs.h
rename to ndk/platforms/android-21/arch-x86/include/asm/statfs.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/svm.h b/ndk/platforms/android-21/arch-x86/include/asm/svm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/svm.h
rename to ndk/platforms/android-21/arch-x86/include/asm/svm.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/swab.h b/ndk/platforms/android-21/arch-x86/include/asm/swab.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/swab.h
rename to ndk/platforms/android-21/arch-x86/include/asm/swab.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/termbits.h b/ndk/platforms/android-21/arch-x86/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/termbits.h
rename to ndk/platforms/android-21/arch-x86/include/asm/termbits.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/termios.h b/ndk/platforms/android-21/arch-x86/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/termios.h
rename to ndk/platforms/android-21/arch-x86/include/asm/termios.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/types.h b/ndk/platforms/android-21/arch-x86/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/types.h
rename to ndk/platforms/android-21/arch-x86/include/asm/types.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/ucontext.h b/ndk/platforms/android-21/arch-x86/include/asm/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/ucontext.h
rename to ndk/platforms/android-21/arch-x86/include/asm/ucontext.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/unistd.h b/ndk/platforms/android-21/arch-x86/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/unistd.h
rename to ndk/platforms/android-21/arch-x86/include/asm/unistd.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/unistd_32.h b/ndk/platforms/android-21/arch-x86/include/asm/unistd_32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/unistd_32.h
rename to ndk/platforms/android-21/arch-x86/include/asm/unistd_32.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/unistd_64.h b/ndk/platforms/android-21/arch-x86/include/asm/unistd_64.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/unistd_64.h
rename to ndk/platforms/android-21/arch-x86/include/asm/unistd_64.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/unistd_x32.h b/ndk/platforms/android-21/arch-x86/include/asm/unistd_x32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/unistd_x32.h
rename to ndk/platforms/android-21/arch-x86/include/asm/unistd_x32.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/vm86.h b/ndk/platforms/android-21/arch-x86/include/asm/vm86.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/vm86.h
rename to ndk/platforms/android-21/arch-x86/include/asm/vm86.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/vmx.h b/ndk/platforms/android-21/arch-x86/include/asm/vmx.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/vmx.h
rename to ndk/platforms/android-21/arch-x86/include/asm/vmx.h
diff --git a/ndk/platforms/android-L/arch-x86/include/asm/vsyscall.h b/ndk/platforms/android-21/arch-x86/include/asm/vsyscall.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/asm/vsyscall.h
rename to ndk/platforms/android-21/arch-x86/include/asm/vsyscall.h
diff --git a/ndk/platforms/android-L/arch-x86/include/i386/elf_machdep.h b/ndk/platforms/android-21/arch-x86/include/i386/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/i386/elf_machdep.h
rename to ndk/platforms/android-21/arch-x86/include/i386/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-x86/include/machine/asm.h b/ndk/platforms/android-21/arch-x86/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/machine/asm.h
rename to ndk/platforms/android-21/arch-x86/include/machine/asm.h
diff --git a/ndk/platforms/android-L/arch-x86/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-x86/include/machine/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/machine/elf_machdep.h
rename to ndk/platforms/android-21/arch-x86/include/machine/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-x86/include/machine/endian.h b/ndk/platforms/android-21/arch-x86/include/machine/endian.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/machine/endian.h
rename to ndk/platforms/android-21/arch-x86/include/machine/endian.h
diff --git a/ndk/platforms/android-L/arch-x86/include/machine/exec.h b/ndk/platforms/android-21/arch-x86/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/machine/exec.h
rename to ndk/platforms/android-21/arch-x86/include/machine/exec.h
diff --git a/ndk/platforms/android-L/arch-x86/include/machine/fenv.h b/ndk/platforms/android-21/arch-x86/include/machine/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/machine/fenv.h
rename to ndk/platforms/android-21/arch-x86/include/machine/fenv.h
diff --git a/ndk/platforms/android-L/arch-x86/include/machine/setjmp.h b/ndk/platforms/android-21/arch-x86/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/include/machine/setjmp.h
rename to ndk/platforms/android-21/arch-x86/include/machine/setjmp.h
diff --git a/ndk/platforms/android-L/arch-x86/lib/libc.a b/ndk/platforms/android-21/arch-x86/lib/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/lib/libc.a
rename to ndk/platforms/android-21/arch-x86/lib/libc.a
diff --git a/ndk/platforms/android-L/arch-x86/lib/libm.a b/ndk/platforms/android-21/arch-x86/lib/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/lib/libm.a
rename to ndk/platforms/android-21/arch-x86/lib/libm.a
diff --git a/ndk/platforms/android-L/arch-x86/lib/libstdc++.a b/ndk/platforms/android-21/arch-x86/lib/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/lib/libstdc++.a
rename to ndk/platforms/android-21/arch-x86/lib/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-x86/lib/libz.a b/ndk/platforms/android-21/arch-x86/lib/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/lib/libz.a
rename to ndk/platforms/android-21/arch-x86/lib/libz.a
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libGLESv3.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libGLESv3.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libOpenMAXAL.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libOpenMAXAL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libOpenMAXAL.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libOpenMAXAL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libOpenMAXAL.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libOpenMAXAL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libOpenMAXAL.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libOpenMAXAL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libOpenSLES.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libOpenSLES.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libOpenSLES.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libOpenSLES.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libOpenSLES.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libOpenSLES.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libOpenSLES.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libOpenSLES.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libandroid.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libandroid.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libandroid.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libandroid.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libandroid.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libandroid.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libandroid.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libandroid.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libc.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libc.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libc.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libdl.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libdl.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libdl.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libdl.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libdl.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libdl.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libdl.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libdl.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libjnigraphics.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libjnigraphics.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libjnigraphics.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libjnigraphics.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libjnigraphics.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libjnigraphics.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libjnigraphics.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libjnigraphics.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/liblog.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/liblog.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/liblog.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/liblog.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/liblog.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/liblog.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/liblog.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/liblog.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libm.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libm.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libm.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libm.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libm.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libm.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libm.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libm.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libmediandk.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libmediandk.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libmediandk.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libmediandk.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libmediandk.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libmediandk.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libstdc++.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libstdc++.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libstdc++.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libstdc++.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libstdc++.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libstdc++.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libstdc++.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libstdc++.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libz.so.functions.txt b/ndk/platforms/android-21/arch-x86/symbols/libz.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libz.so.functions.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libz.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86/symbols/libz.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libz.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86/symbols/libz.so.variables.txt
rename to ndk/platforms/android-21/arch-x86/symbols/libz.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/a.out.h b/ndk/platforms/android-21/arch-x86_64/include/asm/a.out.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/a.out.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/a.out.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/auxvec.h b/ndk/platforms/android-21/arch-x86_64/include/asm/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/auxvec.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/auxvec.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/bitsperlong.h b/ndk/platforms/android-21/arch-x86_64/include/asm/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/bitsperlong.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/bitsperlong.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/boot.h b/ndk/platforms/android-21/arch-x86_64/include/asm/boot.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/boot.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/boot.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/bootparam.h b/ndk/platforms/android-21/arch-x86_64/include/asm/bootparam.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/bootparam.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/bootparam.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/byteorder.h b/ndk/platforms/android-21/arch-x86_64/include/asm/byteorder.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/byteorder.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/byteorder.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/debugreg.h b/ndk/platforms/android-21/arch-x86_64/include/asm/debugreg.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/debugreg.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/debugreg.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/e820.h b/ndk/platforms/android-21/arch-x86_64/include/asm/e820.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/e820.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/e820.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/errno.h b/ndk/platforms/android-21/arch-x86_64/include/asm/errno.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/errno.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/errno.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/fcntl.h b/ndk/platforms/android-21/arch-x86_64/include/asm/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/fcntl.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/fcntl.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/hw_breakpoint.h b/ndk/platforms/android-21/arch-x86_64/include/asm/hw_breakpoint.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/hw_breakpoint.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/hw_breakpoint.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/hyperv.h b/ndk/platforms/android-21/arch-x86_64/include/asm/hyperv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/hyperv.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/hyperv.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ioctl.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ioctl.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ioctl.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ioctls.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ioctls.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ioctls.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ipcbuf.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ipcbuf.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ipcbuf.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ist.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ist.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ist.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ist.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/kvm.h b/ndk/platforms/android-21/arch-x86_64/include/asm/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/kvm.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/kvm.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/kvm_para.h b/ndk/platforms/android-21/arch-x86_64/include/asm/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/kvm_para.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/kvm_para.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ldt.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ldt.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ldt.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ldt.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/mce.h b/ndk/platforms/android-21/arch-x86_64/include/asm/mce.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/mce.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/mce.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/mman.h b/ndk/platforms/android-21/arch-x86_64/include/asm/mman.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/mman.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/mman.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/msgbuf.h b/ndk/platforms/android-21/arch-x86_64/include/asm/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/msgbuf.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/msgbuf.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/msr-index.h b/ndk/platforms/android-21/arch-x86_64/include/asm/msr-index.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/msr-index.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/msr-index.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/msr.h b/ndk/platforms/android-21/arch-x86_64/include/asm/msr.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/msr.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/msr.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/mtrr.h b/ndk/platforms/android-21/arch-x86_64/include/asm/mtrr.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/mtrr.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/mtrr.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/param.h b/ndk/platforms/android-21/arch-x86_64/include/asm/param.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/param.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/param.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/perf_regs.h b/ndk/platforms/android-21/arch-x86_64/include/asm/perf_regs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/perf_regs.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/perf_regs.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/poll.h b/ndk/platforms/android-21/arch-x86_64/include/asm/poll.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/poll.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/poll.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/posix_types.h b/ndk/platforms/android-21/arch-x86_64/include/asm/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/posix_types.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/posix_types.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/posix_types_32.h b/ndk/platforms/android-21/arch-x86_64/include/asm/posix_types_32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/posix_types_32.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/posix_types_32.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/posix_types_64.h b/ndk/platforms/android-21/arch-x86_64/include/asm/posix_types_64.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/posix_types_64.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/posix_types_64.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/posix_types_x32.h b/ndk/platforms/android-21/arch-x86_64/include/asm/posix_types_x32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/posix_types_x32.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/posix_types_x32.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/prctl.h b/ndk/platforms/android-21/arch-x86_64/include/asm/prctl.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/prctl.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/prctl.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/processor-flags.h b/ndk/platforms/android-21/arch-x86_64/include/asm/processor-flags.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/processor-flags.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/processor-flags.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ptrace-abi.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ptrace-abi.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ptrace-abi.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ptrace-abi.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ptrace.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ptrace.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ptrace.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/resource.h b/ndk/platforms/android-21/arch-x86_64/include/asm/resource.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/resource.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/resource.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/sembuf.h b/ndk/platforms/android-21/arch-x86_64/include/asm/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/sembuf.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/sembuf.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/setup.h b/ndk/platforms/android-21/arch-x86_64/include/asm/setup.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/setup.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/setup.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/shmbuf.h b/ndk/platforms/android-21/arch-x86_64/include/asm/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/shmbuf.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/shmbuf.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/sigcontext.h b/ndk/platforms/android-21/arch-x86_64/include/asm/sigcontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/sigcontext.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/sigcontext.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/sigcontext32.h b/ndk/platforms/android-21/arch-x86_64/include/asm/sigcontext32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/sigcontext32.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/sigcontext32.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/siginfo.h b/ndk/platforms/android-21/arch-x86_64/include/asm/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/siginfo.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/siginfo.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/signal.h b/ndk/platforms/android-21/arch-x86_64/include/asm/signal.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/signal.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/signal.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/socket.h b/ndk/platforms/android-21/arch-x86_64/include/asm/socket.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/socket.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/socket.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/sockios.h b/ndk/platforms/android-21/arch-x86_64/include/asm/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/sockios.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/sockios.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/stat.h b/ndk/platforms/android-21/arch-x86_64/include/asm/stat.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/stat.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/stat.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/statfs.h b/ndk/platforms/android-21/arch-x86_64/include/asm/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/statfs.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/statfs.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/svm.h b/ndk/platforms/android-21/arch-x86_64/include/asm/svm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/svm.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/svm.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/swab.h b/ndk/platforms/android-21/arch-x86_64/include/asm/swab.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/swab.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/swab.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/termbits.h b/ndk/platforms/android-21/arch-x86_64/include/asm/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/termbits.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/termbits.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/termios.h b/ndk/platforms/android-21/arch-x86_64/include/asm/termios.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/termios.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/termios.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/types.h b/ndk/platforms/android-21/arch-x86_64/include/asm/types.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/types.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/types.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/ucontext.h b/ndk/platforms/android-21/arch-x86_64/include/asm/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/ucontext.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/ucontext.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/unistd.h b/ndk/platforms/android-21/arch-x86_64/include/asm/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/unistd.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/unistd.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/unistd_32.h b/ndk/platforms/android-21/arch-x86_64/include/asm/unistd_32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/unistd_32.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/unistd_32.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/unistd_64.h b/ndk/platforms/android-21/arch-x86_64/include/asm/unistd_64.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/unistd_64.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/unistd_64.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/unistd_x32.h b/ndk/platforms/android-21/arch-x86_64/include/asm/unistd_x32.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/unistd_x32.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/unistd_x32.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/vm86.h b/ndk/platforms/android-21/arch-x86_64/include/asm/vm86.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/vm86.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/vm86.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/vmx.h b/ndk/platforms/android-21/arch-x86_64/include/asm/vmx.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/vmx.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/vmx.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/asm/vsyscall.h b/ndk/platforms/android-21/arch-x86_64/include/asm/vsyscall.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/asm/vsyscall.h
rename to ndk/platforms/android-21/arch-x86_64/include/asm/vsyscall.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/i386/elf_machdep.h b/ndk/platforms/android-21/arch-x86_64/include/i386/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/i386/elf_machdep.h
rename to ndk/platforms/android-21/arch-x86_64/include/i386/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/asm.h b/ndk/platforms/android-21/arch-x86_64/include/machine/asm.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/asm.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/asm.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/elf_machdep.h b/ndk/platforms/android-21/arch-x86_64/include/machine/elf_machdep.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/elf_machdep.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/elf_machdep.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/endian.h b/ndk/platforms/android-21/arch-x86_64/include/machine/endian.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/endian.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/endian.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/exec.h b/ndk/platforms/android-21/arch-x86_64/include/machine/exec.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/exec.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/exec.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/fenv.h b/ndk/platforms/android-21/arch-x86_64/include/machine/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/fenv.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/fenv.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/fpu.h b/ndk/platforms/android-21/arch-x86_64/include/machine/fpu.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/fpu.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/fpu.h
diff --git a/ndk/platforms/android-L/arch-x86_64/include/machine/setjmp.h b/ndk/platforms/android-21/arch-x86_64/include/machine/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/include/machine/setjmp.h
rename to ndk/platforms/android-21/arch-x86_64/include/machine/setjmp.h
diff --git a/ndk/platforms/android-L/arch-x86_64/lib b/ndk/platforms/android-21/arch-x86_64/lib
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/lib
rename to ndk/platforms/android-21/arch-x86_64/lib
diff --git a/ndk/platforms/android-L/arch-x86_64/lib-bootstrap b/ndk/platforms/android-21/arch-x86_64/lib-bootstrap
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/lib-bootstrap
rename to ndk/platforms/android-21/arch-x86_64/lib-bootstrap
diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libc.a b/ndk/platforms/android-21/arch-x86_64/lib64/libc.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/lib64/libc.a
rename to ndk/platforms/android-21/arch-x86_64/lib64/libc.a
diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libm.a b/ndk/platforms/android-21/arch-x86_64/lib64/libm.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/lib64/libm.a
rename to ndk/platforms/android-21/arch-x86_64/lib64/libm.a
diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libstdc++.a b/ndk/platforms/android-21/arch-x86_64/lib64/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/lib64/libstdc++.a
rename to ndk/platforms/android-21/arch-x86_64/lib64/libstdc++.a
diff --git a/ndk/platforms/android-L/arch-x86_64/lib64/libz.a b/ndk/platforms/android-21/arch-x86_64/lib64/libz.a
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/lib64/libz.a
rename to ndk/platforms/android-21/arch-x86_64/lib64/libz.a
diff --git a/ndk/platforms/android-L/arch-x86_64/src b/ndk/platforms/android-21/arch-x86_64/src
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/src
rename to ndk/platforms/android-21/arch-x86_64/src
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libEGL.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libEGL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libEGL.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libEGL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libEGL.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libEGL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libEGL.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libEGL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libGLESv1_CM.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libGLESv1_CM.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libGLESv1_CM.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libGLESv1_CM.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libGLESv1_CM.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libGLESv1_CM.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libGLESv1_CM.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libGLESv1_CM.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libGLESv2.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libGLESv2.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libGLESv2.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libGLESv2.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libGLESv2.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libGLESv2.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libGLESv2.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libGLESv2.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libGLESv3.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libGLESv3.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libOpenMAXAL.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libOpenMAXAL.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libOpenMAXAL.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libOpenMAXAL.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libOpenMAXAL.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libOpenMAXAL.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libOpenMAXAL.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libOpenMAXAL.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libOpenSLES.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libOpenSLES.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libOpenSLES.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libOpenSLES.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libOpenSLES.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libOpenSLES.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libOpenSLES.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libOpenSLES.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libandroid.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libandroid.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libandroid.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libandroid.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libandroid.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libandroid.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libandroid.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libandroid.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libc.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libc.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libc.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libdl.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libdl.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libdl.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libdl.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libdl.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libdl.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libdl.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libdl.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libjnigraphics.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libjnigraphics.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libjnigraphics.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libjnigraphics.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libjnigraphics.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libjnigraphics.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libjnigraphics.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libjnigraphics.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/liblog.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/liblog.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/liblog.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/liblog.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/liblog.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/liblog.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/liblog.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/liblog.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libm.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libm.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libm.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libm.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libm.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libm.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libm.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libm.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libmediandk.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libmediandk.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libmediandk.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libmediandk.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libmediandk.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libmediandk.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libstdc++.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libstdc++.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libstdc++.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libstdc++.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libstdc++.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libstdc++.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libstdc++.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libstdc++.so.variables.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libz.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libz.so.functions.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libz.so.functions.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libz.so.functions.txt
diff --git a/ndk/platforms/android-L/arch-x86_64/symbols/libz.so.variables.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libz.so.variables.txt
similarity index 100%
rename from ndk/platforms/android-L/arch-x86_64/symbols/libz.so.variables.txt
rename to ndk/platforms/android-21/arch-x86_64/symbols/libz.so.variables.txt
diff --git a/ndk/platforms/android-L/include/GLES2/gl2.h b/ndk/platforms/android-21/include/GLES2/gl2.h
similarity index 100%
rename from ndk/platforms/android-L/include/GLES2/gl2.h
rename to ndk/platforms/android-21/include/GLES2/gl2.h
diff --git a/ndk/platforms/android-L/include/GLES2/gl2ext.h b/ndk/platforms/android-21/include/GLES2/gl2ext.h
similarity index 100%
rename from ndk/platforms/android-L/include/GLES2/gl2ext.h
rename to ndk/platforms/android-21/include/GLES2/gl2ext.h
diff --git a/ndk/platforms/android-L/include/GLES2/gl2platform.h b/ndk/platforms/android-21/include/GLES2/gl2platform.h
similarity index 100%
rename from ndk/platforms/android-L/include/GLES2/gl2platform.h
rename to ndk/platforms/android-21/include/GLES2/gl2platform.h
diff --git a/ndk/platforms/android-L/include/GLES3/gl3.h b/ndk/platforms/android-21/include/GLES3/gl3.h
similarity index 100%
rename from ndk/platforms/android-L/include/GLES3/gl3.h
rename to ndk/platforms/android-21/include/GLES3/gl3.h
diff --git a/ndk/platforms/android-L/include/GLES3/gl31.h b/ndk/platforms/android-21/include/GLES3/gl31.h
similarity index 100%
rename from ndk/platforms/android-L/include/GLES3/gl31.h
rename to ndk/platforms/android-21/include/GLES3/gl31.h
diff --git a/ndk/platforms/android-L/include/GLES3/gl3platform.h b/ndk/platforms/android-21/include/GLES3/gl3platform.h
similarity index 100%
rename from ndk/platforms/android-L/include/GLES3/gl3platform.h
rename to ndk/platforms/android-21/include/GLES3/gl3platform.h
diff --git a/ndk/platforms/android-L/include/SLES/OpenSLES.h b/ndk/platforms/android-21/include/SLES/OpenSLES.h
similarity index 100%
rename from ndk/platforms/android-L/include/SLES/OpenSLES.h
rename to ndk/platforms/android-21/include/SLES/OpenSLES.h
diff --git a/ndk/platforms/android-L/include/SLES/OpenSLES_Android.h b/ndk/platforms/android-21/include/SLES/OpenSLES_Android.h
similarity index 100%
rename from ndk/platforms/android-L/include/SLES/OpenSLES_Android.h
rename to ndk/platforms/android-21/include/SLES/OpenSLES_Android.h
diff --git a/ndk/platforms/android-L/include/SLES/OpenSLES_AndroidConfiguration.h b/ndk/platforms/android-21/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
rename from ndk/platforms/android-L/include/SLES/OpenSLES_AndroidConfiguration.h
rename to ndk/platforms/android-21/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/ndk/platforms/android-L/include/SLES/OpenSLES_AndroidMetadata.h b/ndk/platforms/android-21/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
rename from ndk/platforms/android-L/include/SLES/OpenSLES_AndroidMetadata.h
rename to ndk/platforms/android-21/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/ndk/platforms/android-L/include/SLES/OpenSLES_Platform.h b/ndk/platforms/android-21/include/SLES/OpenSLES_Platform.h
similarity index 100%
rename from ndk/platforms/android-L/include/SLES/OpenSLES_Platform.h
rename to ndk/platforms/android-21/include/SLES/OpenSLES_Platform.h
diff --git a/ndk/platforms/android-L/include/alloca.h b/ndk/platforms/android-21/include/alloca.h
similarity index 100%
rename from ndk/platforms/android-L/include/alloca.h
rename to ndk/platforms/android-21/include/alloca.h
diff --git a/ndk/platforms/android-L/include/android/api-level.h b/ndk/platforms/android-21/include/android/api-level.h
similarity index 100%
rename from ndk/platforms/android-L/include/android/api-level.h
rename to ndk/platforms/android-21/include/android/api-level.h
diff --git a/ndk/platforms/android-L/include/android/configuration.h b/ndk/platforms/android-21/include/android/configuration.h
similarity index 100%
rename from ndk/platforms/android-L/include/android/configuration.h
rename to ndk/platforms/android-21/include/android/configuration.h
diff --git a/ndk/platforms/android-L/include/android/dlext.h b/ndk/platforms/android-21/include/android/dlext.h
similarity index 100%
rename from ndk/platforms/android-L/include/android/dlext.h
rename to ndk/platforms/android-21/include/android/dlext.h
diff --git a/ndk/platforms/android-L/include/android/keycodes.h b/ndk/platforms/android-21/include/android/keycodes.h
similarity index 100%
rename from ndk/platforms/android-L/include/android/keycodes.h
rename to ndk/platforms/android-21/include/android/keycodes.h
diff --git a/ndk/platforms/android-L/include/android/sensor.h b/ndk/platforms/android-21/include/android/sensor.h
similarity index 100%
rename from ndk/platforms/android-L/include/android/sensor.h
rename to ndk/platforms/android-21/include/android/sensor.h
diff --git a/ndk/platforms/android-L/include/ar.h b/ndk/platforms/android-21/include/ar.h
similarity index 100%
rename from ndk/platforms/android-L/include/ar.h
rename to ndk/platforms/android-21/include/ar.h
diff --git a/ndk/platforms/android-L/include/arpa/inet.h b/ndk/platforms/android-21/include/arpa/inet.h
similarity index 100%
rename from ndk/platforms/android-L/include/arpa/inet.h
rename to ndk/platforms/android-21/include/arpa/inet.h
diff --git a/ndk/platforms/android-L/include/arpa/nameser.h b/ndk/platforms/android-21/include/arpa/nameser.h
similarity index 100%
rename from ndk/platforms/android-L/include/arpa/nameser.h
rename to ndk/platforms/android-21/include/arpa/nameser.h
diff --git a/ndk/platforms/android-L/include/arpa/nameser_compat.h b/ndk/platforms/android-21/include/arpa/nameser_compat.h
similarity index 100%
rename from ndk/platforms/android-L/include/arpa/nameser_compat.h
rename to ndk/platforms/android-21/include/arpa/nameser_compat.h
diff --git a/ndk/platforms/android-L/include/arpa/telnet.h b/ndk/platforms/android-21/include/arpa/telnet.h
similarity index 100%
rename from ndk/platforms/android-L/include/arpa/telnet.h
rename to ndk/platforms/android-21/include/arpa/telnet.h
diff --git a/ndk/platforms/android-L/include/asm-generic/auxvec.h b/ndk/platforms/android-21/include/asm-generic/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/auxvec.h
rename to ndk/platforms/android-21/include/asm-generic/auxvec.h
diff --git a/ndk/platforms/android-L/include/asm-generic/bitsperlong.h b/ndk/platforms/android-21/include/asm-generic/bitsperlong.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/bitsperlong.h
rename to ndk/platforms/android-21/include/asm-generic/bitsperlong.h
diff --git a/ndk/platforms/android-L/include/asm-generic/errno-base.h b/ndk/platforms/android-21/include/asm-generic/errno-base.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/errno-base.h
rename to ndk/platforms/android-21/include/asm-generic/errno-base.h
diff --git a/ndk/platforms/android-L/include/asm-generic/errno.h b/ndk/platforms/android-21/include/asm-generic/errno.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/errno.h
rename to ndk/platforms/android-21/include/asm-generic/errno.h
diff --git a/ndk/platforms/android-L/include/asm-generic/fcntl.h b/ndk/platforms/android-21/include/asm-generic/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/fcntl.h
rename to ndk/platforms/android-21/include/asm-generic/fcntl.h
diff --git a/ndk/platforms/android-L/include/asm-generic/int-l64.h b/ndk/platforms/android-21/include/asm-generic/int-l64.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/int-l64.h
rename to ndk/platforms/android-21/include/asm-generic/int-l64.h
diff --git a/ndk/platforms/android-L/include/asm-generic/int-ll64.h b/ndk/platforms/android-21/include/asm-generic/int-ll64.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/int-ll64.h
rename to ndk/platforms/android-21/include/asm-generic/int-ll64.h
diff --git a/ndk/platforms/android-L/include/asm-generic/ioctl.h b/ndk/platforms/android-21/include/asm-generic/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/ioctl.h
rename to ndk/platforms/android-21/include/asm-generic/ioctl.h
diff --git a/ndk/platforms/android-L/include/asm-generic/ioctls.h b/ndk/platforms/android-21/include/asm-generic/ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/ioctls.h
rename to ndk/platforms/android-21/include/asm-generic/ioctls.h
diff --git a/ndk/platforms/android-L/include/asm-generic/ipcbuf.h b/ndk/platforms/android-21/include/asm-generic/ipcbuf.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/ipcbuf.h
rename to ndk/platforms/android-21/include/asm-generic/ipcbuf.h
diff --git a/ndk/platforms/android-L/include/asm-generic/kvm_para.h b/ndk/platforms/android-21/include/asm-generic/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/kvm_para.h
rename to ndk/platforms/android-21/include/asm-generic/kvm_para.h
diff --git a/ndk/platforms/android-L/include/asm-generic/mman-common.h b/ndk/platforms/android-21/include/asm-generic/mman-common.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/mman-common.h
rename to ndk/platforms/android-21/include/asm-generic/mman-common.h
diff --git a/ndk/platforms/android-L/include/asm-generic/mman.h b/ndk/platforms/android-21/include/asm-generic/mman.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/mman.h
rename to ndk/platforms/android-21/include/asm-generic/mman.h
diff --git a/ndk/platforms/android-L/include/asm-generic/msgbuf.h b/ndk/platforms/android-21/include/asm-generic/msgbuf.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/msgbuf.h
rename to ndk/platforms/android-21/include/asm-generic/msgbuf.h
diff --git a/ndk/platforms/android-L/include/asm-generic/param.h b/ndk/platforms/android-21/include/asm-generic/param.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/param.h
rename to ndk/platforms/android-21/include/asm-generic/param.h
diff --git a/ndk/platforms/android-L/include/asm-generic/poll.h b/ndk/platforms/android-21/include/asm-generic/poll.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/poll.h
rename to ndk/platforms/android-21/include/asm-generic/poll.h
diff --git a/ndk/platforms/android-L/include/asm-generic/posix_types.h b/ndk/platforms/android-21/include/asm-generic/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/posix_types.h
rename to ndk/platforms/android-21/include/asm-generic/posix_types.h
diff --git a/ndk/platforms/android-L/include/asm-generic/resource.h b/ndk/platforms/android-21/include/asm-generic/resource.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/resource.h
rename to ndk/platforms/android-21/include/asm-generic/resource.h
diff --git a/ndk/platforms/android-L/include/asm-generic/sembuf.h b/ndk/platforms/android-21/include/asm-generic/sembuf.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/sembuf.h
rename to ndk/platforms/android-21/include/asm-generic/sembuf.h
diff --git a/ndk/platforms/android-L/include/asm-generic/setup.h b/ndk/platforms/android-21/include/asm-generic/setup.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/setup.h
rename to ndk/platforms/android-21/include/asm-generic/setup.h
diff --git a/ndk/platforms/android-L/include/asm-generic/shmbuf.h b/ndk/platforms/android-21/include/asm-generic/shmbuf.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/shmbuf.h
rename to ndk/platforms/android-21/include/asm-generic/shmbuf.h
diff --git a/ndk/platforms/android-L/include/asm-generic/shmparam.h b/ndk/platforms/android-21/include/asm-generic/shmparam.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/shmparam.h
rename to ndk/platforms/android-21/include/asm-generic/shmparam.h
diff --git a/ndk/platforms/android-L/include/asm-generic/siginfo.h b/ndk/platforms/android-21/include/asm-generic/siginfo.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/siginfo.h
rename to ndk/platforms/android-21/include/asm-generic/siginfo.h
diff --git a/ndk/platforms/android-L/include/asm-generic/signal-defs.h b/ndk/platforms/android-21/include/asm-generic/signal-defs.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/signal-defs.h
rename to ndk/platforms/android-21/include/asm-generic/signal-defs.h
diff --git a/ndk/platforms/android-L/include/asm-generic/signal.h b/ndk/platforms/android-21/include/asm-generic/signal.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/signal.h
rename to ndk/platforms/android-21/include/asm-generic/signal.h
diff --git a/ndk/platforms/android-L/include/asm-generic/socket.h b/ndk/platforms/android-21/include/asm-generic/socket.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/socket.h
rename to ndk/platforms/android-21/include/asm-generic/socket.h
diff --git a/ndk/platforms/android-L/include/asm-generic/sockios.h b/ndk/platforms/android-21/include/asm-generic/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/sockios.h
rename to ndk/platforms/android-21/include/asm-generic/sockios.h
diff --git a/ndk/platforms/android-L/include/asm-generic/stat.h b/ndk/platforms/android-21/include/asm-generic/stat.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/stat.h
rename to ndk/platforms/android-21/include/asm-generic/stat.h
diff --git a/ndk/platforms/android-L/include/asm-generic/statfs.h b/ndk/platforms/android-21/include/asm-generic/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/statfs.h
rename to ndk/platforms/android-21/include/asm-generic/statfs.h
diff --git a/ndk/platforms/android-L/include/asm-generic/swab.h b/ndk/platforms/android-21/include/asm-generic/swab.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/swab.h
rename to ndk/platforms/android-21/include/asm-generic/swab.h
diff --git a/ndk/platforms/android-L/include/asm-generic/termbits.h b/ndk/platforms/android-21/include/asm-generic/termbits.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/termbits.h
rename to ndk/platforms/android-21/include/asm-generic/termbits.h
diff --git a/ndk/platforms/android-L/include/asm-generic/termios.h b/ndk/platforms/android-21/include/asm-generic/termios.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/termios.h
rename to ndk/platforms/android-21/include/asm-generic/termios.h
diff --git a/ndk/platforms/android-L/include/asm-generic/types.h b/ndk/platforms/android-21/include/asm-generic/types.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/types.h
rename to ndk/platforms/android-21/include/asm-generic/types.h
diff --git a/ndk/platforms/android-L/include/asm-generic/ucontext.h b/ndk/platforms/android-21/include/asm-generic/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/ucontext.h
rename to ndk/platforms/android-21/include/asm-generic/ucontext.h
diff --git a/ndk/platforms/android-L/include/asm-generic/unistd.h b/ndk/platforms/android-21/include/asm-generic/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/include/asm-generic/unistd.h
rename to ndk/platforms/android-21/include/asm-generic/unistd.h
diff --git a/ndk/platforms/android-L/include/assert.h b/ndk/platforms/android-21/include/assert.h
similarity index 100%
rename from ndk/platforms/android-L/include/assert.h
rename to ndk/platforms/android-21/include/assert.h
diff --git a/ndk/platforms/android-L/include/byteswap.h b/ndk/platforms/android-21/include/byteswap.h
similarity index 100%
rename from ndk/platforms/android-L/include/byteswap.h
rename to ndk/platforms/android-21/include/byteswap.h
diff --git a/ndk/platforms/android-L/include/complex.h b/ndk/platforms/android-21/include/complex.h
similarity index 100%
rename from ndk/platforms/android-L/include/complex.h
rename to ndk/platforms/android-21/include/complex.h
diff --git a/ndk/platforms/android-L/include/ctype.h b/ndk/platforms/android-21/include/ctype.h
similarity index 100%
rename from ndk/platforms/android-L/include/ctype.h
rename to ndk/platforms/android-21/include/ctype.h
diff --git a/ndk/platforms/android-L/include/dirent.h b/ndk/platforms/android-21/include/dirent.h
similarity index 100%
rename from ndk/platforms/android-L/include/dirent.h
rename to ndk/platforms/android-21/include/dirent.h
diff --git a/ndk/platforms/android-L/include/dlfcn.h b/ndk/platforms/android-21/include/dlfcn.h
similarity index 100%
rename from ndk/platforms/android-L/include/dlfcn.h
rename to ndk/platforms/android-21/include/dlfcn.h
diff --git a/ndk/platforms/android-L/include/elf.h b/ndk/platforms/android-21/include/elf.h
similarity index 100%
rename from ndk/platforms/android-L/include/elf.h
rename to ndk/platforms/android-21/include/elf.h
diff --git a/ndk/platforms/android-L/include/endian.h b/ndk/platforms/android-21/include/endian.h
similarity index 100%
rename from ndk/platforms/android-L/include/endian.h
rename to ndk/platforms/android-21/include/endian.h
diff --git a/ndk/platforms/android-L/include/err.h b/ndk/platforms/android-21/include/err.h
similarity index 100%
rename from ndk/platforms/android-L/include/err.h
rename to ndk/platforms/android-21/include/err.h
diff --git a/ndk/platforms/android-L/include/errno.h b/ndk/platforms/android-21/include/errno.h
similarity index 100%
rename from ndk/platforms/android-L/include/errno.h
rename to ndk/platforms/android-21/include/errno.h
diff --git a/ndk/platforms/android-L/include/fcntl.h b/ndk/platforms/android-21/include/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/include/fcntl.h
rename to ndk/platforms/android-21/include/fcntl.h
diff --git a/ndk/platforms/android-L/include/features.h b/ndk/platforms/android-21/include/features.h
similarity index 100%
rename from ndk/platforms/android-L/include/features.h
rename to ndk/platforms/android-21/include/features.h
diff --git a/ndk/platforms/android-L/include/fenv.h b/ndk/platforms/android-21/include/fenv.h
similarity index 100%
rename from ndk/platforms/android-L/include/fenv.h
rename to ndk/platforms/android-21/include/fenv.h
diff --git a/ndk/platforms/android-L/include/fnmatch.h b/ndk/platforms/android-21/include/fnmatch.h
similarity index 100%
rename from ndk/platforms/android-L/include/fnmatch.h
rename to ndk/platforms/android-21/include/fnmatch.h
diff --git a/ndk/platforms/android-L/include/fts.h b/ndk/platforms/android-21/include/fts.h
similarity index 100%
rename from ndk/platforms/android-L/include/fts.h
rename to ndk/platforms/android-21/include/fts.h
diff --git a/ndk/platforms/android-L/include/ftw.h b/ndk/platforms/android-21/include/ftw.h
similarity index 100%
rename from ndk/platforms/android-L/include/ftw.h
rename to ndk/platforms/android-21/include/ftw.h
diff --git a/ndk/platforms/android-L/include/getopt.h b/ndk/platforms/android-21/include/getopt.h
similarity index 100%
rename from ndk/platforms/android-L/include/getopt.h
rename to ndk/platforms/android-21/include/getopt.h
diff --git a/ndk/platforms/android-L/include/grp.h b/ndk/platforms/android-21/include/grp.h
similarity index 100%
rename from ndk/platforms/android-L/include/grp.h
rename to ndk/platforms/android-21/include/grp.h
diff --git a/ndk/platforms/android-L/include/inttypes.h b/ndk/platforms/android-21/include/inttypes.h
similarity index 100%
rename from ndk/platforms/android-L/include/inttypes.h
rename to ndk/platforms/android-21/include/inttypes.h
diff --git a/ndk/platforms/android-L/include/lastlog.h b/ndk/platforms/android-21/include/lastlog.h
similarity index 100%
rename from ndk/platforms/android-L/include/lastlog.h
rename to ndk/platforms/android-21/include/lastlog.h
diff --git a/ndk/platforms/android-L/include/libgen.h b/ndk/platforms/android-21/include/libgen.h
similarity index 100%
rename from ndk/platforms/android-L/include/libgen.h
rename to ndk/platforms/android-21/include/libgen.h
diff --git a/ndk/platforms/android-L/include/limits.h b/ndk/platforms/android-21/include/limits.h
similarity index 100%
rename from ndk/platforms/android-L/include/limits.h
rename to ndk/platforms/android-21/include/limits.h
diff --git a/ndk/platforms/android-L/include/link.h b/ndk/platforms/android-21/include/link.h
similarity index 100%
rename from ndk/platforms/android-L/include/link.h
rename to ndk/platforms/android-21/include/link.h
diff --git a/ndk/platforms/android-L/include/linux/a.out.h b/ndk/platforms/android-21/include/linux/a.out.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/a.out.h
rename to ndk/platforms/android-21/include/linux/a.out.h
diff --git a/ndk/platforms/android-L/include/linux/acct.h b/ndk/platforms/android-21/include/linux/acct.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/acct.h
rename to ndk/platforms/android-21/include/linux/acct.h
diff --git a/ndk/platforms/android-L/include/linux/adb.h b/ndk/platforms/android-21/include/linux/adb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/adb.h
rename to ndk/platforms/android-21/include/linux/adb.h
diff --git a/ndk/platforms/android-L/include/linux/adfs_fs.h b/ndk/platforms/android-21/include/linux/adfs_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/adfs_fs.h
rename to ndk/platforms/android-21/include/linux/adfs_fs.h
diff --git a/ndk/platforms/android-L/include/linux/affs_hardblocks.h b/ndk/platforms/android-21/include/linux/affs_hardblocks.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/affs_hardblocks.h
rename to ndk/platforms/android-21/include/linux/affs_hardblocks.h
diff --git a/ndk/platforms/android-L/include/linux/agpgart.h b/ndk/platforms/android-21/include/linux/agpgart.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/agpgart.h
rename to ndk/platforms/android-21/include/linux/agpgart.h
diff --git a/ndk/platforms/android-L/include/linux/aio_abi.h b/ndk/platforms/android-21/include/linux/aio_abi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/aio_abi.h
rename to ndk/platforms/android-21/include/linux/aio_abi.h
diff --git a/ndk/platforms/android-L/include/linux/android_alarm.h b/ndk/platforms/android-21/include/linux/android_alarm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/android_alarm.h
rename to ndk/platforms/android-21/include/linux/android_alarm.h
diff --git a/ndk/platforms/android-L/include/linux/apm_bios.h b/ndk/platforms/android-21/include/linux/apm_bios.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/apm_bios.h
rename to ndk/platforms/android-21/include/linux/apm_bios.h
diff --git a/ndk/platforms/android-L/include/linux/arcfb.h b/ndk/platforms/android-21/include/linux/arcfb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/arcfb.h
rename to ndk/platforms/android-21/include/linux/arcfb.h
diff --git a/ndk/platforms/android-L/include/linux/ashmem.h b/ndk/platforms/android-21/include/linux/ashmem.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ashmem.h
rename to ndk/platforms/android-21/include/linux/ashmem.h
diff --git a/ndk/platforms/android-L/include/linux/atalk.h b/ndk/platforms/android-21/include/linux/atalk.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atalk.h
rename to ndk/platforms/android-21/include/linux/atalk.h
diff --git a/ndk/platforms/android-L/include/linux/atm.h b/ndk/platforms/android-21/include/linux/atm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm.h
rename to ndk/platforms/android-21/include/linux/atm.h
diff --git a/ndk/platforms/android-L/include/linux/atm_eni.h b/ndk/platforms/android-21/include/linux/atm_eni.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm_eni.h
rename to ndk/platforms/android-21/include/linux/atm_eni.h
diff --git a/ndk/platforms/android-L/include/linux/atm_he.h b/ndk/platforms/android-21/include/linux/atm_he.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm_he.h
rename to ndk/platforms/android-21/include/linux/atm_he.h
diff --git a/ndk/platforms/android-L/include/linux/atm_idt77105.h b/ndk/platforms/android-21/include/linux/atm_idt77105.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm_idt77105.h
rename to ndk/platforms/android-21/include/linux/atm_idt77105.h
diff --git a/ndk/platforms/android-L/include/linux/atm_nicstar.h b/ndk/platforms/android-21/include/linux/atm_nicstar.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm_nicstar.h
rename to ndk/platforms/android-21/include/linux/atm_nicstar.h
diff --git a/ndk/platforms/android-L/include/linux/atm_tcp.h b/ndk/platforms/android-21/include/linux/atm_tcp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm_tcp.h
rename to ndk/platforms/android-21/include/linux/atm_tcp.h
diff --git a/ndk/platforms/android-L/include/linux/atm_zatm.h b/ndk/platforms/android-21/include/linux/atm_zatm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atm_zatm.h
rename to ndk/platforms/android-21/include/linux/atm_zatm.h
diff --git a/ndk/platforms/android-L/include/linux/atmapi.h b/ndk/platforms/android-21/include/linux/atmapi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmapi.h
rename to ndk/platforms/android-21/include/linux/atmapi.h
diff --git a/ndk/platforms/android-L/include/linux/atmarp.h b/ndk/platforms/android-21/include/linux/atmarp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmarp.h
rename to ndk/platforms/android-21/include/linux/atmarp.h
diff --git a/ndk/platforms/android-L/include/linux/atmbr2684.h b/ndk/platforms/android-21/include/linux/atmbr2684.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmbr2684.h
rename to ndk/platforms/android-21/include/linux/atmbr2684.h
diff --git a/ndk/platforms/android-L/include/linux/atmclip.h b/ndk/platforms/android-21/include/linux/atmclip.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmclip.h
rename to ndk/platforms/android-21/include/linux/atmclip.h
diff --git a/ndk/platforms/android-L/include/linux/atmdev.h b/ndk/platforms/android-21/include/linux/atmdev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmdev.h
rename to ndk/platforms/android-21/include/linux/atmdev.h
diff --git a/ndk/platforms/android-L/include/linux/atmioc.h b/ndk/platforms/android-21/include/linux/atmioc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmioc.h
rename to ndk/platforms/android-21/include/linux/atmioc.h
diff --git a/ndk/platforms/android-L/include/linux/atmlec.h b/ndk/platforms/android-21/include/linux/atmlec.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmlec.h
rename to ndk/platforms/android-21/include/linux/atmlec.h
diff --git a/ndk/platforms/android-L/include/linux/atmmpc.h b/ndk/platforms/android-21/include/linux/atmmpc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmmpc.h
rename to ndk/platforms/android-21/include/linux/atmmpc.h
diff --git a/ndk/platforms/android-L/include/linux/atmppp.h b/ndk/platforms/android-21/include/linux/atmppp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmppp.h
rename to ndk/platforms/android-21/include/linux/atmppp.h
diff --git a/ndk/platforms/android-L/include/linux/atmsap.h b/ndk/platforms/android-21/include/linux/atmsap.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmsap.h
rename to ndk/platforms/android-21/include/linux/atmsap.h
diff --git a/ndk/platforms/android-L/include/linux/atmsvc.h b/ndk/platforms/android-21/include/linux/atmsvc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/atmsvc.h
rename to ndk/platforms/android-21/include/linux/atmsvc.h
diff --git a/ndk/platforms/android-L/include/linux/audit.h b/ndk/platforms/android-21/include/linux/audit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/audit.h
rename to ndk/platforms/android-21/include/linux/audit.h
diff --git a/ndk/platforms/android-L/include/linux/auto_fs.h b/ndk/platforms/android-21/include/linux/auto_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/auto_fs.h
rename to ndk/platforms/android-21/include/linux/auto_fs.h
diff --git a/ndk/platforms/android-L/include/linux/auto_fs4.h b/ndk/platforms/android-21/include/linux/auto_fs4.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/auto_fs4.h
rename to ndk/platforms/android-21/include/linux/auto_fs4.h
diff --git a/ndk/platforms/android-L/include/linux/auxvec.h b/ndk/platforms/android-21/include/linux/auxvec.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/auxvec.h
rename to ndk/platforms/android-21/include/linux/auxvec.h
diff --git a/ndk/platforms/android-L/include/linux/ax25.h b/ndk/platforms/android-21/include/linux/ax25.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ax25.h
rename to ndk/platforms/android-21/include/linux/ax25.h
diff --git a/ndk/platforms/android-L/include/linux/b1lli.h b/ndk/platforms/android-21/include/linux/b1lli.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/b1lli.h
rename to ndk/platforms/android-21/include/linux/b1lli.h
diff --git a/ndk/platforms/android-L/include/linux/baycom.h b/ndk/platforms/android-21/include/linux/baycom.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/baycom.h
rename to ndk/platforms/android-21/include/linux/baycom.h
diff --git a/ndk/platforms/android-L/include/linux/bcache.h b/ndk/platforms/android-21/include/linux/bcache.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/bcache.h
rename to ndk/platforms/android-21/include/linux/bcache.h
diff --git a/ndk/platforms/android-L/include/linux/bcm933xx_hcs.h b/ndk/platforms/android-21/include/linux/bcm933xx_hcs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/bcm933xx_hcs.h
rename to ndk/platforms/android-21/include/linux/bcm933xx_hcs.h
diff --git a/ndk/platforms/android-L/include/linux/bfs_fs.h b/ndk/platforms/android-21/include/linux/bfs_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/bfs_fs.h
rename to ndk/platforms/android-21/include/linux/bfs_fs.h
diff --git a/ndk/platforms/android-L/include/linux/binder.h b/ndk/platforms/android-21/include/linux/binder.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/binder.h
rename to ndk/platforms/android-21/include/linux/binder.h
diff --git a/ndk/platforms/android-L/include/linux/binfmts.h b/ndk/platforms/android-21/include/linux/binfmts.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/binfmts.h
rename to ndk/platforms/android-21/include/linux/binfmts.h
diff --git a/ndk/platforms/android-L/include/linux/blkpg.h b/ndk/platforms/android-21/include/linux/blkpg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/blkpg.h
rename to ndk/platforms/android-21/include/linux/blkpg.h
diff --git a/ndk/platforms/android-L/include/linux/blktrace_api.h b/ndk/platforms/android-21/include/linux/blktrace_api.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/blktrace_api.h
rename to ndk/platforms/android-21/include/linux/blktrace_api.h
diff --git a/ndk/platforms/android-L/include/linux/bpqether.h b/ndk/platforms/android-21/include/linux/bpqether.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/bpqether.h
rename to ndk/platforms/android-21/include/linux/bpqether.h
diff --git a/ndk/platforms/android-L/include/linux/bsg.h b/ndk/platforms/android-21/include/linux/bsg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/bsg.h
rename to ndk/platforms/android-21/include/linux/bsg.h
diff --git a/ndk/platforms/android-L/include/linux/btrfs.h b/ndk/platforms/android-21/include/linux/btrfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/btrfs.h
rename to ndk/platforms/android-21/include/linux/btrfs.h
diff --git a/ndk/platforms/android-L/include/linux/byteorder/big_endian.h b/ndk/platforms/android-21/include/linux/byteorder/big_endian.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/byteorder/big_endian.h
rename to ndk/platforms/android-21/include/linux/byteorder/big_endian.h
diff --git a/ndk/platforms/android-L/include/linux/byteorder/little_endian.h b/ndk/platforms/android-21/include/linux/byteorder/little_endian.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/byteorder/little_endian.h
rename to ndk/platforms/android-21/include/linux/byteorder/little_endian.h
diff --git a/ndk/platforms/android-L/include/linux/caif/caif_socket.h b/ndk/platforms/android-21/include/linux/caif/caif_socket.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/caif/caif_socket.h
rename to ndk/platforms/android-21/include/linux/caif/caif_socket.h
diff --git a/ndk/platforms/android-L/include/linux/caif/if_caif.h b/ndk/platforms/android-21/include/linux/caif/if_caif.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/caif/if_caif.h
rename to ndk/platforms/android-21/include/linux/caif/if_caif.h
diff --git a/ndk/platforms/android-L/include/linux/can.h b/ndk/platforms/android-21/include/linux/can.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/can.h
rename to ndk/platforms/android-21/include/linux/can.h
diff --git a/ndk/platforms/android-L/include/linux/can/bcm.h b/ndk/platforms/android-21/include/linux/can/bcm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/can/bcm.h
rename to ndk/platforms/android-21/include/linux/can/bcm.h
diff --git a/ndk/platforms/android-L/include/linux/can/error.h b/ndk/platforms/android-21/include/linux/can/error.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/can/error.h
rename to ndk/platforms/android-21/include/linux/can/error.h
diff --git a/ndk/platforms/android-L/include/linux/can/gw.h b/ndk/platforms/android-21/include/linux/can/gw.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/can/gw.h
rename to ndk/platforms/android-21/include/linux/can/gw.h
diff --git a/ndk/platforms/android-L/include/linux/can/netlink.h b/ndk/platforms/android-21/include/linux/can/netlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/can/netlink.h
rename to ndk/platforms/android-21/include/linux/can/netlink.h
diff --git a/ndk/platforms/android-L/include/linux/can/raw.h b/ndk/platforms/android-21/include/linux/can/raw.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/can/raw.h
rename to ndk/platforms/android-21/include/linux/can/raw.h
diff --git a/ndk/platforms/android-L/include/linux/capability.h b/ndk/platforms/android-21/include/linux/capability.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/capability.h
rename to ndk/platforms/android-21/include/linux/capability.h
diff --git a/ndk/platforms/android-L/include/linux/capi.h b/ndk/platforms/android-21/include/linux/capi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/capi.h
rename to ndk/platforms/android-21/include/linux/capi.h
diff --git a/ndk/platforms/android-L/include/linux/cciss_defs.h b/ndk/platforms/android-21/include/linux/cciss_defs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cciss_defs.h
rename to ndk/platforms/android-21/include/linux/cciss_defs.h
diff --git a/ndk/platforms/android-L/include/linux/cciss_ioctl.h b/ndk/platforms/android-21/include/linux/cciss_ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cciss_ioctl.h
rename to ndk/platforms/android-21/include/linux/cciss_ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/cdrom.h b/ndk/platforms/android-21/include/linux/cdrom.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cdrom.h
rename to ndk/platforms/android-21/include/linux/cdrom.h
diff --git a/ndk/platforms/android-L/include/linux/cgroupstats.h b/ndk/platforms/android-21/include/linux/cgroupstats.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cgroupstats.h
rename to ndk/platforms/android-21/include/linux/cgroupstats.h
diff --git a/ndk/platforms/android-L/include/linux/chio.h b/ndk/platforms/android-21/include/linux/chio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/chio.h
rename to ndk/platforms/android-21/include/linux/chio.h
diff --git a/ndk/platforms/android-L/include/linux/cifs/cifs_mount.h b/ndk/platforms/android-21/include/linux/cifs/cifs_mount.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cifs/cifs_mount.h
rename to ndk/platforms/android-21/include/linux/cifs/cifs_mount.h
diff --git a/ndk/platforms/android-L/include/linux/cm4000_cs.h b/ndk/platforms/android-21/include/linux/cm4000_cs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cm4000_cs.h
rename to ndk/platforms/android-21/include/linux/cm4000_cs.h
diff --git a/ndk/platforms/android-L/include/linux/cn_proc.h b/ndk/platforms/android-21/include/linux/cn_proc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cn_proc.h
rename to ndk/platforms/android-21/include/linux/cn_proc.h
diff --git a/ndk/platforms/android-L/include/linux/coda.h b/ndk/platforms/android-21/include/linux/coda.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/coda.h
rename to ndk/platforms/android-21/include/linux/coda.h
diff --git a/ndk/platforms/android-L/include/linux/coda_psdev.h b/ndk/platforms/android-21/include/linux/coda_psdev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/coda_psdev.h
rename to ndk/platforms/android-21/include/linux/coda_psdev.h
diff --git a/ndk/platforms/android-L/include/linux/coff.h b/ndk/platforms/android-21/include/linux/coff.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/coff.h
rename to ndk/platforms/android-21/include/linux/coff.h
diff --git a/ndk/platforms/android-L/include/linux/compiler.h b/ndk/platforms/android-21/include/linux/compiler.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/compiler.h
rename to ndk/platforms/android-21/include/linux/compiler.h
diff --git a/ndk/platforms/android-L/include/linux/connector.h b/ndk/platforms/android-21/include/linux/connector.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/connector.h
rename to ndk/platforms/android-21/include/linux/connector.h
diff --git a/ndk/platforms/android-L/include/linux/const.h b/ndk/platforms/android-21/include/linux/const.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/const.h
rename to ndk/platforms/android-21/include/linux/const.h
diff --git a/ndk/platforms/android-L/include/linux/cramfs_fs.h b/ndk/platforms/android-21/include/linux/cramfs_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cramfs_fs.h
rename to ndk/platforms/android-21/include/linux/cramfs_fs.h
diff --git a/ndk/platforms/android-L/include/linux/cuda.h b/ndk/platforms/android-21/include/linux/cuda.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cuda.h
rename to ndk/platforms/android-21/include/linux/cuda.h
diff --git a/ndk/platforms/android-L/include/linux/cyclades.h b/ndk/platforms/android-21/include/linux/cyclades.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cyclades.h
rename to ndk/platforms/android-21/include/linux/cyclades.h
diff --git a/ndk/platforms/android-L/include/linux/cycx_cfm.h b/ndk/platforms/android-21/include/linux/cycx_cfm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/cycx_cfm.h
rename to ndk/platforms/android-21/include/linux/cycx_cfm.h
diff --git a/ndk/platforms/android-L/include/linux/dcbnl.h b/ndk/platforms/android-21/include/linux/dcbnl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dcbnl.h
rename to ndk/platforms/android-21/include/linux/dcbnl.h
diff --git a/ndk/platforms/android-L/include/linux/dccp.h b/ndk/platforms/android-21/include/linux/dccp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dccp.h
rename to ndk/platforms/android-21/include/linux/dccp.h
diff --git a/ndk/platforms/android-L/include/linux/dlm.h b/ndk/platforms/android-21/include/linux/dlm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dlm.h
rename to ndk/platforms/android-21/include/linux/dlm.h
diff --git a/ndk/platforms/android-L/include/linux/dlm_device.h b/ndk/platforms/android-21/include/linux/dlm_device.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dlm_device.h
rename to ndk/platforms/android-21/include/linux/dlm_device.h
diff --git a/ndk/platforms/android-L/include/linux/dlm_netlink.h b/ndk/platforms/android-21/include/linux/dlm_netlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dlm_netlink.h
rename to ndk/platforms/android-21/include/linux/dlm_netlink.h
diff --git a/ndk/platforms/android-L/include/linux/dlm_plock.h b/ndk/platforms/android-21/include/linux/dlm_plock.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dlm_plock.h
rename to ndk/platforms/android-21/include/linux/dlm_plock.h
diff --git a/ndk/platforms/android-L/include/linux/dlmconstants.h b/ndk/platforms/android-21/include/linux/dlmconstants.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dlmconstants.h
rename to ndk/platforms/android-21/include/linux/dlmconstants.h
diff --git a/ndk/platforms/android-L/include/linux/dm-ioctl.h b/ndk/platforms/android-21/include/linux/dm-ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dm-ioctl.h
rename to ndk/platforms/android-21/include/linux/dm-ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/dm-log-userspace.h b/ndk/platforms/android-21/include/linux/dm-log-userspace.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dm-log-userspace.h
rename to ndk/platforms/android-21/include/linux/dm-log-userspace.h
diff --git a/ndk/platforms/android-L/include/linux/dn.h b/ndk/platforms/android-21/include/linux/dn.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dn.h
rename to ndk/platforms/android-21/include/linux/dn.h
diff --git a/ndk/platforms/android-L/include/linux/dqblk_xfs.h b/ndk/platforms/android-21/include/linux/dqblk_xfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dqblk_xfs.h
rename to ndk/platforms/android-21/include/linux/dqblk_xfs.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/audio.h b/ndk/platforms/android-21/include/linux/dvb/audio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/audio.h
rename to ndk/platforms/android-21/include/linux/dvb/audio.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/ca.h b/ndk/platforms/android-21/include/linux/dvb/ca.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/ca.h
rename to ndk/platforms/android-21/include/linux/dvb/ca.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/dmx.h b/ndk/platforms/android-21/include/linux/dvb/dmx.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/dmx.h
rename to ndk/platforms/android-21/include/linux/dvb/dmx.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/frontend.h b/ndk/platforms/android-21/include/linux/dvb/frontend.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/frontend.h
rename to ndk/platforms/android-21/include/linux/dvb/frontend.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/net.h b/ndk/platforms/android-21/include/linux/dvb/net.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/net.h
rename to ndk/platforms/android-21/include/linux/dvb/net.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/osd.h b/ndk/platforms/android-21/include/linux/dvb/osd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/osd.h
rename to ndk/platforms/android-21/include/linux/dvb/osd.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/version.h b/ndk/platforms/android-21/include/linux/dvb/version.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/version.h
rename to ndk/platforms/android-21/include/linux/dvb/version.h
diff --git a/ndk/platforms/android-L/include/linux/dvb/video.h b/ndk/platforms/android-21/include/linux/dvb/video.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/dvb/video.h
rename to ndk/platforms/android-21/include/linux/dvb/video.h
diff --git a/ndk/platforms/android-L/include/linux/edd.h b/ndk/platforms/android-21/include/linux/edd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/edd.h
rename to ndk/platforms/android-21/include/linux/edd.h
diff --git a/ndk/platforms/android-L/include/linux/efs_fs_sb.h b/ndk/platforms/android-21/include/linux/efs_fs_sb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/efs_fs_sb.h
rename to ndk/platforms/android-21/include/linux/efs_fs_sb.h
diff --git a/ndk/platforms/android-L/include/linux/elf-em.h b/ndk/platforms/android-21/include/linux/elf-em.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/elf-em.h
rename to ndk/platforms/android-21/include/linux/elf-em.h
diff --git a/ndk/platforms/android-L/include/linux/elf-fdpic.h b/ndk/platforms/android-21/include/linux/elf-fdpic.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/elf-fdpic.h
rename to ndk/platforms/android-21/include/linux/elf-fdpic.h
diff --git a/ndk/platforms/android-L/include/linux/elf.h b/ndk/platforms/android-21/include/linux/elf.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/elf.h
rename to ndk/platforms/android-21/include/linux/elf.h
diff --git a/ndk/platforms/android-L/include/linux/elfcore.h b/ndk/platforms/android-21/include/linux/elfcore.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/elfcore.h
rename to ndk/platforms/android-21/include/linux/elfcore.h
diff --git a/ndk/platforms/android-L/include/linux/errno.h b/ndk/platforms/android-21/include/linux/errno.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/errno.h
rename to ndk/platforms/android-21/include/linux/errno.h
diff --git a/ndk/platforms/android-L/include/linux/errqueue.h b/ndk/platforms/android-21/include/linux/errqueue.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/errqueue.h
rename to ndk/platforms/android-21/include/linux/errqueue.h
diff --git a/ndk/platforms/android-L/include/linux/ethtool.h b/ndk/platforms/android-21/include/linux/ethtool.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ethtool.h
rename to ndk/platforms/android-21/include/linux/ethtool.h
diff --git a/ndk/platforms/android-L/include/linux/eventpoll.h b/ndk/platforms/android-21/include/linux/eventpoll.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/eventpoll.h
rename to ndk/platforms/android-21/include/linux/eventpoll.h
diff --git a/ndk/platforms/android-L/include/linux/fadvise.h b/ndk/platforms/android-21/include/linux/fadvise.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fadvise.h
rename to ndk/platforms/android-21/include/linux/fadvise.h
diff --git a/ndk/platforms/android-L/include/linux/falloc.h b/ndk/platforms/android-21/include/linux/falloc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/falloc.h
rename to ndk/platforms/android-21/include/linux/falloc.h
diff --git a/ndk/platforms/android-L/include/linux/fanotify.h b/ndk/platforms/android-21/include/linux/fanotify.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fanotify.h
rename to ndk/platforms/android-21/include/linux/fanotify.h
diff --git a/ndk/platforms/android-L/include/linux/fb.h b/ndk/platforms/android-21/include/linux/fb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fb.h
rename to ndk/platforms/android-21/include/linux/fb.h
diff --git a/ndk/platforms/android-L/include/linux/fcntl.h b/ndk/platforms/android-21/include/linux/fcntl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fcntl.h
rename to ndk/platforms/android-21/include/linux/fcntl.h
diff --git a/ndk/platforms/android-L/include/linux/fd.h b/ndk/platforms/android-21/include/linux/fd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fd.h
rename to ndk/platforms/android-21/include/linux/fd.h
diff --git a/ndk/platforms/android-L/include/linux/fdreg.h b/ndk/platforms/android-21/include/linux/fdreg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fdreg.h
rename to ndk/platforms/android-21/include/linux/fdreg.h
diff --git a/ndk/platforms/android-L/include/linux/fib_rules.h b/ndk/platforms/android-21/include/linux/fib_rules.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fib_rules.h
rename to ndk/platforms/android-21/include/linux/fib_rules.h
diff --git a/ndk/platforms/android-L/include/linux/fiemap.h b/ndk/platforms/android-21/include/linux/fiemap.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fiemap.h
rename to ndk/platforms/android-21/include/linux/fiemap.h
diff --git a/ndk/platforms/android-L/include/linux/filter.h b/ndk/platforms/android-21/include/linux/filter.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/filter.h
rename to ndk/platforms/android-21/include/linux/filter.h
diff --git a/ndk/platforms/android-L/include/linux/firewire-cdev.h b/ndk/platforms/android-21/include/linux/firewire-cdev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/firewire-cdev.h
rename to ndk/platforms/android-21/include/linux/firewire-cdev.h
diff --git a/ndk/platforms/android-L/include/linux/firewire-constants.h b/ndk/platforms/android-21/include/linux/firewire-constants.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/firewire-constants.h
rename to ndk/platforms/android-21/include/linux/firewire-constants.h
diff --git a/ndk/platforms/android-L/include/linux/flat.h b/ndk/platforms/android-21/include/linux/flat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/flat.h
rename to ndk/platforms/android-21/include/linux/flat.h
diff --git a/ndk/platforms/android-L/include/linux/fs.h b/ndk/platforms/android-21/include/linux/fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fs.h
rename to ndk/platforms/android-21/include/linux/fs.h
diff --git a/ndk/platforms/android-L/include/linux/fsl_hypervisor.h b/ndk/platforms/android-21/include/linux/fsl_hypervisor.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fsl_hypervisor.h
rename to ndk/platforms/android-21/include/linux/fsl_hypervisor.h
diff --git a/ndk/platforms/android-L/include/linux/fuse.h b/ndk/platforms/android-21/include/linux/fuse.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/fuse.h
rename to ndk/platforms/android-21/include/linux/fuse.h
diff --git a/ndk/platforms/android-L/include/linux/futex.h b/ndk/platforms/android-21/include/linux/futex.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/futex.h
rename to ndk/platforms/android-21/include/linux/futex.h
diff --git a/ndk/platforms/android-L/include/linux/gameport.h b/ndk/platforms/android-21/include/linux/gameport.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/gameport.h
rename to ndk/platforms/android-21/include/linux/gameport.h
diff --git a/ndk/platforms/android-L/include/linux/gen_stats.h b/ndk/platforms/android-21/include/linux/gen_stats.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/gen_stats.h
rename to ndk/platforms/android-21/include/linux/gen_stats.h
diff --git a/ndk/platforms/android-L/include/linux/genetlink.h b/ndk/platforms/android-21/include/linux/genetlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/genetlink.h
rename to ndk/platforms/android-21/include/linux/genetlink.h
diff --git a/ndk/platforms/android-L/include/linux/genwqe/genwqe_card.h b/ndk/platforms/android-21/include/linux/genwqe/genwqe_card.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/genwqe/genwqe_card.h
rename to ndk/platforms/android-21/include/linux/genwqe/genwqe_card.h
diff --git a/ndk/platforms/android-L/include/linux/gfs2_ondisk.h b/ndk/platforms/android-21/include/linux/gfs2_ondisk.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/gfs2_ondisk.h
rename to ndk/platforms/android-21/include/linux/gfs2_ondisk.h
diff --git a/ndk/platforms/android-L/include/linux/gigaset_dev.h b/ndk/platforms/android-21/include/linux/gigaset_dev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/gigaset_dev.h
rename to ndk/platforms/android-21/include/linux/gigaset_dev.h
diff --git a/ndk/platforms/android-L/include/linux/hash_info.h b/ndk/platforms/android-21/include/linux/hash_info.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hash_info.h
rename to ndk/platforms/android-21/include/linux/hash_info.h
diff --git a/ndk/platforms/android-L/include/linux/hdlc.h b/ndk/platforms/android-21/include/linux/hdlc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hdlc.h
rename to ndk/platforms/android-21/include/linux/hdlc.h
diff --git a/ndk/platforms/android-L/include/linux/hdlc/ioctl.h b/ndk/platforms/android-21/include/linux/hdlc/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hdlc/ioctl.h
rename to ndk/platforms/android-21/include/linux/hdlc/ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/hdlcdrv.h b/ndk/platforms/android-21/include/linux/hdlcdrv.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hdlcdrv.h
rename to ndk/platforms/android-21/include/linux/hdlcdrv.h
diff --git a/ndk/platforms/android-L/include/linux/hdreg.h b/ndk/platforms/android-21/include/linux/hdreg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hdreg.h
rename to ndk/platforms/android-21/include/linux/hdreg.h
diff --git a/ndk/platforms/android-L/include/linux/hid.h b/ndk/platforms/android-21/include/linux/hid.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hid.h
rename to ndk/platforms/android-21/include/linux/hid.h
diff --git a/ndk/platforms/android-L/include/linux/hiddev.h b/ndk/platforms/android-21/include/linux/hiddev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hiddev.h
rename to ndk/platforms/android-21/include/linux/hiddev.h
diff --git a/ndk/platforms/android-L/include/linux/hidraw.h b/ndk/platforms/android-21/include/linux/hidraw.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hidraw.h
rename to ndk/platforms/android-21/include/linux/hidraw.h
diff --git a/ndk/platforms/android-L/include/linux/hpet.h b/ndk/platforms/android-21/include/linux/hpet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hpet.h
rename to ndk/platforms/android-21/include/linux/hpet.h
diff --git a/ndk/platforms/android-L/include/linux/hsi/hsi_char.h b/ndk/platforms/android-21/include/linux/hsi/hsi_char.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hsi/hsi_char.h
rename to ndk/platforms/android-21/include/linux/hsi/hsi_char.h
diff --git a/ndk/platforms/android-L/include/linux/hsr_netlink.h b/ndk/platforms/android-21/include/linux/hsr_netlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hsr_netlink.h
rename to ndk/platforms/android-21/include/linux/hsr_netlink.h
diff --git a/ndk/platforms/android-L/include/linux/hw_breakpoint.h b/ndk/platforms/android-21/include/linux/hw_breakpoint.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hw_breakpoint.h
rename to ndk/platforms/android-21/include/linux/hw_breakpoint.h
diff --git a/ndk/platforms/android-L/include/linux/hysdn_if.h b/ndk/platforms/android-21/include/linux/hysdn_if.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/hysdn_if.h
rename to ndk/platforms/android-21/include/linux/hysdn_if.h
diff --git a/ndk/platforms/android-L/include/linux/i2c-dev.h b/ndk/platforms/android-21/include/linux/i2c-dev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/i2c-dev.h
rename to ndk/platforms/android-21/include/linux/i2c-dev.h
diff --git a/ndk/platforms/android-L/include/linux/i2c.h b/ndk/platforms/android-21/include/linux/i2c.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/i2c.h
rename to ndk/platforms/android-21/include/linux/i2c.h
diff --git a/ndk/platforms/android-L/include/linux/i2o-dev.h b/ndk/platforms/android-21/include/linux/i2o-dev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/i2o-dev.h
rename to ndk/platforms/android-21/include/linux/i2o-dev.h
diff --git a/ndk/platforms/android-L/include/linux/i8k.h b/ndk/platforms/android-21/include/linux/i8k.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/i8k.h
rename to ndk/platforms/android-21/include/linux/i8k.h
diff --git a/ndk/platforms/android-L/include/linux/icmp.h b/ndk/platforms/android-21/include/linux/icmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/icmp.h
rename to ndk/platforms/android-21/include/linux/icmp.h
diff --git a/ndk/platforms/android-L/include/linux/icmpv6.h b/ndk/platforms/android-21/include/linux/icmpv6.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/icmpv6.h
rename to ndk/platforms/android-21/include/linux/icmpv6.h
diff --git a/ndk/platforms/android-L/include/linux/if.h b/ndk/platforms/android-21/include/linux/if.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if.h
rename to ndk/platforms/android-21/include/linux/if.h
diff --git a/ndk/platforms/android-L/include/linux/if_addr.h b/ndk/platforms/android-21/include/linux/if_addr.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_addr.h
rename to ndk/platforms/android-21/include/linux/if_addr.h
diff --git a/ndk/platforms/android-L/include/linux/if_addrlabel.h b/ndk/platforms/android-21/include/linux/if_addrlabel.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_addrlabel.h
rename to ndk/platforms/android-21/include/linux/if_addrlabel.h
diff --git a/ndk/platforms/android-L/include/linux/if_alg.h b/ndk/platforms/android-21/include/linux/if_alg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_alg.h
rename to ndk/platforms/android-21/include/linux/if_alg.h
diff --git a/ndk/platforms/android-L/include/linux/if_arcnet.h b/ndk/platforms/android-21/include/linux/if_arcnet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_arcnet.h
rename to ndk/platforms/android-21/include/linux/if_arcnet.h
diff --git a/ndk/platforms/android-L/include/linux/if_arp.h b/ndk/platforms/android-21/include/linux/if_arp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_arp.h
rename to ndk/platforms/android-21/include/linux/if_arp.h
diff --git a/ndk/platforms/android-L/include/linux/if_bonding.h b/ndk/platforms/android-21/include/linux/if_bonding.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_bonding.h
rename to ndk/platforms/android-21/include/linux/if_bonding.h
diff --git a/ndk/platforms/android-L/include/linux/if_bridge.h b/ndk/platforms/android-21/include/linux/if_bridge.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_bridge.h
rename to ndk/platforms/android-21/include/linux/if_bridge.h
diff --git a/ndk/platforms/android-L/include/linux/if_cablemodem.h b/ndk/platforms/android-21/include/linux/if_cablemodem.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_cablemodem.h
rename to ndk/platforms/android-21/include/linux/if_cablemodem.h
diff --git a/ndk/platforms/android-L/include/linux/if_eql.h b/ndk/platforms/android-21/include/linux/if_eql.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_eql.h
rename to ndk/platforms/android-21/include/linux/if_eql.h
diff --git a/ndk/platforms/android-L/include/linux/if_ether.h b/ndk/platforms/android-21/include/linux/if_ether.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_ether.h
rename to ndk/platforms/android-21/include/linux/if_ether.h
diff --git a/ndk/platforms/android-L/include/linux/if_fc.h b/ndk/platforms/android-21/include/linux/if_fc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_fc.h
rename to ndk/platforms/android-21/include/linux/if_fc.h
diff --git a/ndk/platforms/android-L/include/linux/if_fddi.h b/ndk/platforms/android-21/include/linux/if_fddi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_fddi.h
rename to ndk/platforms/android-21/include/linux/if_fddi.h
diff --git a/ndk/platforms/android-L/include/linux/if_frad.h b/ndk/platforms/android-21/include/linux/if_frad.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_frad.h
rename to ndk/platforms/android-21/include/linux/if_frad.h
diff --git a/ndk/platforms/android-L/include/linux/if_hippi.h b/ndk/platforms/android-21/include/linux/if_hippi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_hippi.h
rename to ndk/platforms/android-21/include/linux/if_hippi.h
diff --git a/ndk/platforms/android-L/include/linux/if_infiniband.h b/ndk/platforms/android-21/include/linux/if_infiniband.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_infiniband.h
rename to ndk/platforms/android-21/include/linux/if_infiniband.h
diff --git a/ndk/platforms/android-L/include/linux/if_link.h b/ndk/platforms/android-21/include/linux/if_link.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_link.h
rename to ndk/platforms/android-21/include/linux/if_link.h
diff --git a/ndk/platforms/android-L/include/linux/if_ltalk.h b/ndk/platforms/android-21/include/linux/if_ltalk.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_ltalk.h
rename to ndk/platforms/android-21/include/linux/if_ltalk.h
diff --git a/ndk/platforms/android-L/include/linux/if_packet.h b/ndk/platforms/android-21/include/linux/if_packet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_packet.h
rename to ndk/platforms/android-21/include/linux/if_packet.h
diff --git a/ndk/platforms/android-L/include/linux/if_phonet.h b/ndk/platforms/android-21/include/linux/if_phonet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_phonet.h
rename to ndk/platforms/android-21/include/linux/if_phonet.h
diff --git a/ndk/platforms/android-L/include/linux/if_plip.h b/ndk/platforms/android-21/include/linux/if_plip.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_plip.h
rename to ndk/platforms/android-21/include/linux/if_plip.h
diff --git a/ndk/platforms/android-L/include/linux/if_ppp.h b/ndk/platforms/android-21/include/linux/if_ppp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_ppp.h
rename to ndk/platforms/android-21/include/linux/if_ppp.h
diff --git a/ndk/platforms/android-L/include/linux/if_pppol2tp.h b/ndk/platforms/android-21/include/linux/if_pppol2tp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_pppol2tp.h
rename to ndk/platforms/android-21/include/linux/if_pppol2tp.h
diff --git a/ndk/platforms/android-L/include/linux/if_pppolac.h b/ndk/platforms/android-21/include/linux/if_pppolac.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_pppolac.h
rename to ndk/platforms/android-21/include/linux/if_pppolac.h
diff --git a/ndk/platforms/android-L/include/linux/if_pppopns.h b/ndk/platforms/android-21/include/linux/if_pppopns.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_pppopns.h
rename to ndk/platforms/android-21/include/linux/if_pppopns.h
diff --git a/ndk/platforms/android-L/include/linux/if_pppox.h b/ndk/platforms/android-21/include/linux/if_pppox.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_pppox.h
rename to ndk/platforms/android-21/include/linux/if_pppox.h
diff --git a/ndk/platforms/android-L/include/linux/if_slip.h b/ndk/platforms/android-21/include/linux/if_slip.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_slip.h
rename to ndk/platforms/android-21/include/linux/if_slip.h
diff --git a/ndk/platforms/android-L/include/linux/if_team.h b/ndk/platforms/android-21/include/linux/if_team.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_team.h
rename to ndk/platforms/android-21/include/linux/if_team.h
diff --git a/ndk/platforms/android-L/include/linux/if_tun.h b/ndk/platforms/android-21/include/linux/if_tun.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_tun.h
rename to ndk/platforms/android-21/include/linux/if_tun.h
diff --git a/ndk/platforms/android-L/include/linux/if_tunnel.h b/ndk/platforms/android-21/include/linux/if_tunnel.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_tunnel.h
rename to ndk/platforms/android-21/include/linux/if_tunnel.h
diff --git a/ndk/platforms/android-L/include/linux/if_vlan.h b/ndk/platforms/android-21/include/linux/if_vlan.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_vlan.h
rename to ndk/platforms/android-21/include/linux/if_vlan.h
diff --git a/ndk/platforms/android-L/include/linux/if_x25.h b/ndk/platforms/android-21/include/linux/if_x25.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/if_x25.h
rename to ndk/platforms/android-21/include/linux/if_x25.h
diff --git a/ndk/platforms/android-L/include/linux/igmp.h b/ndk/platforms/android-21/include/linux/igmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/igmp.h
rename to ndk/platforms/android-21/include/linux/igmp.h
diff --git a/ndk/platforms/android-L/include/linux/in.h b/ndk/platforms/android-21/include/linux/in.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/in.h
rename to ndk/platforms/android-21/include/linux/in.h
diff --git a/ndk/platforms/android-L/include/linux/in6.h b/ndk/platforms/android-21/include/linux/in6.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/in6.h
rename to ndk/platforms/android-21/include/linux/in6.h
diff --git a/ndk/platforms/android-L/include/linux/in_route.h b/ndk/platforms/android-21/include/linux/in_route.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/in_route.h
rename to ndk/platforms/android-21/include/linux/in_route.h
diff --git a/ndk/platforms/android-L/include/linux/inet_diag.h b/ndk/platforms/android-21/include/linux/inet_diag.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/inet_diag.h
rename to ndk/platforms/android-21/include/linux/inet_diag.h
diff --git a/ndk/platforms/android-L/include/linux/inotify.h b/ndk/platforms/android-21/include/linux/inotify.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/inotify.h
rename to ndk/platforms/android-21/include/linux/inotify.h
diff --git a/ndk/platforms/android-L/include/linux/input.h b/ndk/platforms/android-21/include/linux/input.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/input.h
rename to ndk/platforms/android-21/include/linux/input.h
diff --git a/ndk/platforms/android-L/include/linux/ioctl.h b/ndk/platforms/android-21/include/linux/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ioctl.h
rename to ndk/platforms/android-21/include/linux/ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/ion.h b/ndk/platforms/android-21/include/linux/ion.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ion.h
rename to ndk/platforms/android-21/include/linux/ion.h
diff --git a/ndk/platforms/android-L/include/linux/ioprio.h b/ndk/platforms/android-21/include/linux/ioprio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ioprio.h
rename to ndk/platforms/android-21/include/linux/ioprio.h
diff --git a/ndk/platforms/android-L/include/linux/ip.h b/ndk/platforms/android-21/include/linux/ip.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ip.h
rename to ndk/platforms/android-21/include/linux/ip.h
diff --git a/ndk/platforms/android-L/include/linux/ip6_tunnel.h b/ndk/platforms/android-21/include/linux/ip6_tunnel.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ip6_tunnel.h
rename to ndk/platforms/android-21/include/linux/ip6_tunnel.h
diff --git a/ndk/platforms/android-L/include/linux/ip_vs.h b/ndk/platforms/android-21/include/linux/ip_vs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ip_vs.h
rename to ndk/platforms/android-21/include/linux/ip_vs.h
diff --git a/ndk/platforms/android-L/include/linux/ipc.h b/ndk/platforms/android-21/include/linux/ipc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipc.h
rename to ndk/platforms/android-21/include/linux/ipc.h
diff --git a/ndk/platforms/android-L/include/linux/ipmi.h b/ndk/platforms/android-21/include/linux/ipmi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipmi.h
rename to ndk/platforms/android-21/include/linux/ipmi.h
diff --git a/ndk/platforms/android-L/include/linux/ipmi_msgdefs.h b/ndk/platforms/android-21/include/linux/ipmi_msgdefs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipmi_msgdefs.h
rename to ndk/platforms/android-21/include/linux/ipmi_msgdefs.h
diff --git a/ndk/platforms/android-L/include/linux/ipsec.h b/ndk/platforms/android-21/include/linux/ipsec.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipsec.h
rename to ndk/platforms/android-21/include/linux/ipsec.h
diff --git a/ndk/platforms/android-L/include/linux/ipv6.h b/ndk/platforms/android-21/include/linux/ipv6.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipv6.h
rename to ndk/platforms/android-21/include/linux/ipv6.h
diff --git a/ndk/platforms/android-L/include/linux/ipv6_route.h b/ndk/platforms/android-21/include/linux/ipv6_route.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipv6_route.h
rename to ndk/platforms/android-21/include/linux/ipv6_route.h
diff --git a/ndk/platforms/android-L/include/linux/ipx.h b/ndk/platforms/android-21/include/linux/ipx.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ipx.h
rename to ndk/platforms/android-21/include/linux/ipx.h
diff --git a/ndk/platforms/android-L/include/linux/irda.h b/ndk/platforms/android-21/include/linux/irda.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/irda.h
rename to ndk/platforms/android-21/include/linux/irda.h
diff --git a/ndk/platforms/android-L/include/linux/irqnr.h b/ndk/platforms/android-21/include/linux/irqnr.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/irqnr.h
rename to ndk/platforms/android-21/include/linux/irqnr.h
diff --git a/ndk/platforms/android-L/include/linux/isdn.h b/ndk/platforms/android-21/include/linux/isdn.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/isdn.h
rename to ndk/platforms/android-21/include/linux/isdn.h
diff --git a/ndk/platforms/android-L/include/linux/isdn/capicmd.h b/ndk/platforms/android-21/include/linux/isdn/capicmd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/isdn/capicmd.h
rename to ndk/platforms/android-21/include/linux/isdn/capicmd.h
diff --git a/ndk/platforms/android-L/include/linux/isdn_divertif.h b/ndk/platforms/android-21/include/linux/isdn_divertif.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/isdn_divertif.h
rename to ndk/platforms/android-21/include/linux/isdn_divertif.h
diff --git a/ndk/platforms/android-L/include/linux/isdn_ppp.h b/ndk/platforms/android-21/include/linux/isdn_ppp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/isdn_ppp.h
rename to ndk/platforms/android-21/include/linux/isdn_ppp.h
diff --git a/ndk/platforms/android-L/include/linux/isdnif.h b/ndk/platforms/android-21/include/linux/isdnif.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/isdnif.h
rename to ndk/platforms/android-21/include/linux/isdnif.h
diff --git a/ndk/platforms/android-L/include/linux/iso_fs.h b/ndk/platforms/android-21/include/linux/iso_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/iso_fs.h
rename to ndk/platforms/android-21/include/linux/iso_fs.h
diff --git a/ndk/platforms/android-L/include/linux/ivtv.h b/ndk/platforms/android-21/include/linux/ivtv.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ivtv.h
rename to ndk/platforms/android-21/include/linux/ivtv.h
diff --git a/ndk/platforms/android-L/include/linux/ivtvfb.h b/ndk/platforms/android-21/include/linux/ivtvfb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ivtvfb.h
rename to ndk/platforms/android-21/include/linux/ivtvfb.h
diff --git a/ndk/platforms/android-L/include/linux/ixjuser.h b/ndk/platforms/android-21/include/linux/ixjuser.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ixjuser.h
rename to ndk/platforms/android-21/include/linux/ixjuser.h
diff --git a/ndk/platforms/android-L/include/linux/jffs2.h b/ndk/platforms/android-21/include/linux/jffs2.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/jffs2.h
rename to ndk/platforms/android-21/include/linux/jffs2.h
diff --git a/ndk/platforms/android-L/include/linux/joystick.h b/ndk/platforms/android-21/include/linux/joystick.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/joystick.h
rename to ndk/platforms/android-21/include/linux/joystick.h
diff --git a/ndk/platforms/android-L/include/linux/kd.h b/ndk/platforms/android-21/include/linux/kd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kd.h
rename to ndk/platforms/android-21/include/linux/kd.h
diff --git a/ndk/platforms/android-L/include/linux/kdev_t.h b/ndk/platforms/android-21/include/linux/kdev_t.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kdev_t.h
rename to ndk/platforms/android-21/include/linux/kdev_t.h
diff --git a/ndk/platforms/android-L/include/linux/kernel-page-flags.h b/ndk/platforms/android-21/include/linux/kernel-page-flags.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kernel-page-flags.h
rename to ndk/platforms/android-21/include/linux/kernel-page-flags.h
diff --git a/ndk/platforms/android-L/include/linux/kernel.h b/ndk/platforms/android-21/include/linux/kernel.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kernel.h
rename to ndk/platforms/android-21/include/linux/kernel.h
diff --git a/ndk/platforms/android-L/include/linux/kernelcapi.h b/ndk/platforms/android-21/include/linux/kernelcapi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kernelcapi.h
rename to ndk/platforms/android-21/include/linux/kernelcapi.h
diff --git a/ndk/platforms/android-L/include/linux/kexec.h b/ndk/platforms/android-21/include/linux/kexec.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kexec.h
rename to ndk/platforms/android-21/include/linux/kexec.h
diff --git a/ndk/platforms/android-L/include/linux/keyboard.h b/ndk/platforms/android-21/include/linux/keyboard.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/keyboard.h
rename to ndk/platforms/android-21/include/linux/keyboard.h
diff --git a/ndk/platforms/android-L/include/linux/keychord.h b/ndk/platforms/android-21/include/linux/keychord.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/keychord.h
rename to ndk/platforms/android-21/include/linux/keychord.h
diff --git a/ndk/platforms/android-L/include/linux/keyctl.h b/ndk/platforms/android-21/include/linux/keyctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/keyctl.h
rename to ndk/platforms/android-21/include/linux/keyctl.h
diff --git a/ndk/platforms/android-L/include/linux/kvm.h b/ndk/platforms/android-21/include/linux/kvm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kvm.h
rename to ndk/platforms/android-21/include/linux/kvm.h
diff --git a/ndk/platforms/android-L/include/linux/kvm_para.h b/ndk/platforms/android-21/include/linux/kvm_para.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/kvm_para.h
rename to ndk/platforms/android-21/include/linux/kvm_para.h
diff --git a/ndk/platforms/android-L/include/linux/l2tp.h b/ndk/platforms/android-21/include/linux/l2tp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/l2tp.h
rename to ndk/platforms/android-21/include/linux/l2tp.h
diff --git a/ndk/platforms/android-L/include/linux/libc-compat.h b/ndk/platforms/android-21/include/linux/libc-compat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/libc-compat.h
rename to ndk/platforms/android-21/include/linux/libc-compat.h
diff --git a/ndk/platforms/android-L/include/linux/limits.h b/ndk/platforms/android-21/include/linux/limits.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/limits.h
rename to ndk/platforms/android-21/include/linux/limits.h
diff --git a/ndk/platforms/android-L/include/linux/llc.h b/ndk/platforms/android-21/include/linux/llc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/llc.h
rename to ndk/platforms/android-21/include/linux/llc.h
diff --git a/ndk/platforms/android-L/include/linux/loop.h b/ndk/platforms/android-21/include/linux/loop.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/loop.h
rename to ndk/platforms/android-21/include/linux/loop.h
diff --git a/ndk/platforms/android-L/include/linux/lp.h b/ndk/platforms/android-21/include/linux/lp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/lp.h
rename to ndk/platforms/android-21/include/linux/lp.h
diff --git a/ndk/platforms/android-L/include/linux/magic.h b/ndk/platforms/android-21/include/linux/magic.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/magic.h
rename to ndk/platforms/android-21/include/linux/magic.h
diff --git a/ndk/platforms/android-L/include/linux/major.h b/ndk/platforms/android-21/include/linux/major.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/major.h
rename to ndk/platforms/android-21/include/linux/major.h
diff --git a/ndk/platforms/android-L/include/linux/map_to_7segment.h b/ndk/platforms/android-21/include/linux/map_to_7segment.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/map_to_7segment.h
rename to ndk/platforms/android-21/include/linux/map_to_7segment.h
diff --git a/ndk/platforms/android-L/include/linux/matroxfb.h b/ndk/platforms/android-21/include/linux/matroxfb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/matroxfb.h
rename to ndk/platforms/android-21/include/linux/matroxfb.h
diff --git a/ndk/platforms/android-L/include/linux/mdio.h b/ndk/platforms/android-21/include/linux/mdio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mdio.h
rename to ndk/platforms/android-21/include/linux/mdio.h
diff --git a/ndk/platforms/android-L/include/linux/media.h b/ndk/platforms/android-21/include/linux/media.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/media.h
rename to ndk/platforms/android-21/include/linux/media.h
diff --git a/ndk/platforms/android-L/include/linux/mei.h b/ndk/platforms/android-21/include/linux/mei.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mei.h
rename to ndk/platforms/android-21/include/linux/mei.h
diff --git a/ndk/platforms/android-L/include/linux/mempolicy.h b/ndk/platforms/android-21/include/linux/mempolicy.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mempolicy.h
rename to ndk/platforms/android-21/include/linux/mempolicy.h
diff --git a/ndk/platforms/android-L/include/linux/meye.h b/ndk/platforms/android-21/include/linux/meye.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/meye.h
rename to ndk/platforms/android-21/include/linux/meye.h
diff --git a/ndk/platforms/android-L/include/linux/mic_common.h b/ndk/platforms/android-21/include/linux/mic_common.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mic_common.h
rename to ndk/platforms/android-21/include/linux/mic_common.h
diff --git a/ndk/platforms/android-L/include/linux/mic_ioctl.h b/ndk/platforms/android-21/include/linux/mic_ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mic_ioctl.h
rename to ndk/platforms/android-21/include/linux/mic_ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/mii.h b/ndk/platforms/android-21/include/linux/mii.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mii.h
rename to ndk/platforms/android-21/include/linux/mii.h
diff --git a/ndk/platforms/android-L/include/linux/minix_fs.h b/ndk/platforms/android-21/include/linux/minix_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/minix_fs.h
rename to ndk/platforms/android-21/include/linux/minix_fs.h
diff --git a/ndk/platforms/android-L/include/linux/mman.h b/ndk/platforms/android-21/include/linux/mman.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mman.h
rename to ndk/platforms/android-21/include/linux/mman.h
diff --git a/ndk/platforms/android-L/include/linux/mmc/ioctl.h b/ndk/platforms/android-21/include/linux/mmc/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mmc/ioctl.h
rename to ndk/platforms/android-21/include/linux/mmc/ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/mmtimer.h b/ndk/platforms/android-21/include/linux/mmtimer.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mmtimer.h
rename to ndk/platforms/android-21/include/linux/mmtimer.h
diff --git a/ndk/platforms/android-L/include/linux/module.h b/ndk/platforms/android-21/include/linux/module.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/module.h
rename to ndk/platforms/android-21/include/linux/module.h
diff --git a/ndk/platforms/android-L/include/linux/mqueue.h b/ndk/platforms/android-21/include/linux/mqueue.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mqueue.h
rename to ndk/platforms/android-21/include/linux/mqueue.h
diff --git a/ndk/platforms/android-L/include/linux/mroute.h b/ndk/platforms/android-21/include/linux/mroute.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mroute.h
rename to ndk/platforms/android-21/include/linux/mroute.h
diff --git a/ndk/platforms/android-L/include/linux/mroute6.h b/ndk/platforms/android-21/include/linux/mroute6.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mroute6.h
rename to ndk/platforms/android-21/include/linux/mroute6.h
diff --git a/ndk/platforms/android-L/include/linux/msdos_fs.h b/ndk/platforms/android-21/include/linux/msdos_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/msdos_fs.h
rename to ndk/platforms/android-21/include/linux/msdos_fs.h
diff --git a/ndk/platforms/android-L/include/linux/msg.h b/ndk/platforms/android-21/include/linux/msg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/msg.h
rename to ndk/platforms/android-21/include/linux/msg.h
diff --git a/ndk/platforms/android-L/include/linux/mtio.h b/ndk/platforms/android-21/include/linux/mtio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/mtio.h
rename to ndk/platforms/android-21/include/linux/mtio.h
diff --git a/ndk/platforms/android-L/include/linux/n_r3964.h b/ndk/platforms/android-21/include/linux/n_r3964.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/n_r3964.h
rename to ndk/platforms/android-21/include/linux/n_r3964.h
diff --git a/ndk/platforms/android-L/include/linux/nbd.h b/ndk/platforms/android-21/include/linux/nbd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nbd.h
rename to ndk/platforms/android-21/include/linux/nbd.h
diff --git a/ndk/platforms/android-L/include/linux/ncp.h b/ndk/platforms/android-21/include/linux/ncp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ncp.h
rename to ndk/platforms/android-21/include/linux/ncp.h
diff --git a/ndk/platforms/android-L/include/linux/ncp_fs.h b/ndk/platforms/android-21/include/linux/ncp_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ncp_fs.h
rename to ndk/platforms/android-21/include/linux/ncp_fs.h
diff --git a/ndk/platforms/android-L/include/linux/ncp_mount.h b/ndk/platforms/android-21/include/linux/ncp_mount.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ncp_mount.h
rename to ndk/platforms/android-21/include/linux/ncp_mount.h
diff --git a/ndk/platforms/android-L/include/linux/ncp_no.h b/ndk/platforms/android-21/include/linux/ncp_no.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ncp_no.h
rename to ndk/platforms/android-21/include/linux/ncp_no.h
diff --git a/ndk/platforms/android-L/include/linux/neighbour.h b/ndk/platforms/android-21/include/linux/neighbour.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/neighbour.h
rename to ndk/platforms/android-21/include/linux/neighbour.h
diff --git a/ndk/platforms/android-L/include/linux/net.h b/ndk/platforms/android-21/include/linux/net.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/net.h
rename to ndk/platforms/android-21/include/linux/net.h
diff --git a/ndk/platforms/android-L/include/linux/net_dropmon.h b/ndk/platforms/android-21/include/linux/net_dropmon.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/net_dropmon.h
rename to ndk/platforms/android-21/include/linux/net_dropmon.h
diff --git a/ndk/platforms/android-L/include/linux/net_tstamp.h b/ndk/platforms/android-21/include/linux/net_tstamp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/net_tstamp.h
rename to ndk/platforms/android-21/include/linux/net_tstamp.h
diff --git a/ndk/platforms/android-L/include/linux/netconf.h b/ndk/platforms/android-21/include/linux/netconf.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netconf.h
rename to ndk/platforms/android-21/include/linux/netconf.h
diff --git a/ndk/platforms/android-L/include/linux/netdevice.h b/ndk/platforms/android-21/include/linux/netdevice.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netdevice.h
rename to ndk/platforms/android-21/include/linux/netdevice.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter.h b/ndk/platforms/android-21/include/linux/netfilter.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter.h
rename to ndk/platforms/android-21/include/linux/netfilter.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set.h b/ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set.h
rename to ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set_bitmap.h b/ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set_bitmap.h
rename to ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set_hash.h b/ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set_hash.h
rename to ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set_list.h b/ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/ipset/ip_set_list.h
rename to ndk/platforms/android-21/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_common.h b/ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_common.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_common.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_ftp.h b/ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_ftp.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_sctp.h b/ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_sctp.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_tcp.h b/ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_tcp.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_tuple_common.h b/ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_nat.h b/ndk/platforms/android-21/include/linux/netfilter/nf_nat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_nat.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_nat.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_tables.h b/ndk/platforms/android-21/include/linux/netfilter/nf_tables.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_tables.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_tables.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nf_tables_compat.h b/ndk/platforms/android-21/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nf_tables_compat.h
rename to ndk/platforms/android-21/include/linux/netfilter/nf_tables_compat.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_acct.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_acct.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_acct.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_compat.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_compat.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_compat.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_conntrack.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_conntrack.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_cthelper.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_cthelper.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_cttimeout.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_cttimeout.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_log.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_log.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_log.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/nfnetlink_queue.h b/ndk/platforms/android-21/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/nfnetlink_queue.h
rename to ndk/platforms/android-21/include/linux/netfilter/nfnetlink_queue.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/x_tables.h b/ndk/platforms/android-21/include/linux/netfilter/x_tables.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/x_tables.h
rename to ndk/platforms/android-21/include/linux/netfilter/x_tables.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_AUDIT.h b/ndk/platforms/android-21/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_AUDIT.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_AUDIT.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_CHECKSUM.h b/ndk/platforms/android-21/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_CHECKSUM.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_CLASSIFY.h b/ndk/platforms/android-21/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_CLASSIFY.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_CONNMARK.h b/ndk/platforms/android-21/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_CONNMARK.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_CONNMARK.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_CONNSECMARK.h b/ndk/platforms/android-21/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_CONNSECMARK.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_CT.h b/ndk/platforms/android-21/include/linux/netfilter/xt_CT.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_CT.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_CT.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_DSCP.h b/ndk/platforms/android-21/include/linux/netfilter/xt_DSCP.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_DSCP.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_DSCP.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_HMARK.h b/ndk/platforms/android-21/include/linux/netfilter/xt_HMARK.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_HMARK.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_HMARK.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_IDLETIMER.h b/ndk/platforms/android-21/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_IDLETIMER.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_LED.h b/ndk/platforms/android-21/include/linux/netfilter/xt_LED.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_LED.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_LED.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_LOG.h b/ndk/platforms/android-21/include/linux/netfilter/xt_LOG.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_LOG.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_LOG.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_MARK.h b/ndk/platforms/android-21/include/linux/netfilter/xt_MARK.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_MARK.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_MARK.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_NFLOG.h b/ndk/platforms/android-21/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_NFLOG.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_NFLOG.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_NFQUEUE.h b/ndk/platforms/android-21/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_NFQUEUE.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_RATEEST.h b/ndk/platforms/android-21/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_RATEEST.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_RATEEST.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_SECMARK.h b/ndk/platforms/android-21/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_SECMARK.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_SECMARK.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_SYNPROXY.h b/ndk/platforms/android-21/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_SYNPROXY.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_TCPMSS.h b/ndk/platforms/android-21/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_TCPMSS.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_TCPMSS.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_TCPOPTSTRIP.h b/ndk/platforms/android-21/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_TCPOPTSTRIP.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_TEE.h b/ndk/platforms/android-21/include/linux/netfilter/xt_TEE.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_TEE.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_TEE.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_TPROXY.h b/ndk/platforms/android-21/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_TPROXY.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_TPROXY.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_addrtype.h b/ndk/platforms/android-21/include/linux/netfilter/xt_addrtype.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_addrtype.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_addrtype.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_bpf.h b/ndk/platforms/android-21/include/linux/netfilter/xt_bpf.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_bpf.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_bpf.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_cgroup.h b/ndk/platforms/android-21/include/linux/netfilter/xt_cgroup.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_cgroup.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_cgroup.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_cluster.h b/ndk/platforms/android-21/include/linux/netfilter/xt_cluster.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_cluster.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_cluster.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_comment.h b/ndk/platforms/android-21/include/linux/netfilter/xt_comment.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_comment.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_comment.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_connbytes.h b/ndk/platforms/android-21/include/linux/netfilter/xt_connbytes.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_connbytes.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_connbytes.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_connlabel.h b/ndk/platforms/android-21/include/linux/netfilter/xt_connlabel.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_connlabel.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_connlabel.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_connlimit.h b/ndk/platforms/android-21/include/linux/netfilter/xt_connlimit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_connlimit.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_connlimit.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_connmark.h b/ndk/platforms/android-21/include/linux/netfilter/xt_connmark.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_connmark.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_connmark.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_conntrack.h b/ndk/platforms/android-21/include/linux/netfilter/xt_conntrack.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_conntrack.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_conntrack.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_cpu.h b/ndk/platforms/android-21/include/linux/netfilter/xt_cpu.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_cpu.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_cpu.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_dccp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_dccp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_dccp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_dccp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_devgroup.h b/ndk/platforms/android-21/include/linux/netfilter/xt_devgroup.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_devgroup.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_devgroup.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_dscp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_dscp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_dscp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_dscp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_ecn.h b/ndk/platforms/android-21/include/linux/netfilter/xt_ecn.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_ecn.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_ecn.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_esp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_esp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_esp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_esp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_hashlimit.h b/ndk/platforms/android-21/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_hashlimit.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_hashlimit.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_helper.h b/ndk/platforms/android-21/include/linux/netfilter/xt_helper.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_helper.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_helper.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_ipcomp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_ipcomp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_ipcomp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_iprange.h b/ndk/platforms/android-21/include/linux/netfilter/xt_iprange.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_iprange.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_iprange.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_ipvs.h b/ndk/platforms/android-21/include/linux/netfilter/xt_ipvs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_ipvs.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_ipvs.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_l2tp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_l2tp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_l2tp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_l2tp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_length.h b/ndk/platforms/android-21/include/linux/netfilter/xt_length.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_length.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_length.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_limit.h b/ndk/platforms/android-21/include/linux/netfilter/xt_limit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_limit.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_limit.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_mac.h b/ndk/platforms/android-21/include/linux/netfilter/xt_mac.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_mac.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_mac.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_mark.h b/ndk/platforms/android-21/include/linux/netfilter/xt_mark.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_mark.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_mark.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_multiport.h b/ndk/platforms/android-21/include/linux/netfilter/xt_multiport.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_multiport.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_multiport.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_nfacct.h b/ndk/platforms/android-21/include/linux/netfilter/xt_nfacct.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_nfacct.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_nfacct.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_osf.h b/ndk/platforms/android-21/include/linux/netfilter/xt_osf.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_osf.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_osf.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_owner.h b/ndk/platforms/android-21/include/linux/netfilter/xt_owner.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_owner.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_owner.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_physdev.h b/ndk/platforms/android-21/include/linux/netfilter/xt_physdev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_physdev.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_physdev.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_pkttype.h b/ndk/platforms/android-21/include/linux/netfilter/xt_pkttype.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_pkttype.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_pkttype.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_policy.h b/ndk/platforms/android-21/include/linux/netfilter/xt_policy.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_policy.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_policy.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_quota.h b/ndk/platforms/android-21/include/linux/netfilter/xt_quota.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_quota.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_quota.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_rateest.h b/ndk/platforms/android-21/include/linux/netfilter/xt_rateest.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_rateest.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_rateest.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_realm.h b/ndk/platforms/android-21/include/linux/netfilter/xt_realm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_realm.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_realm.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_recent.h b/ndk/platforms/android-21/include/linux/netfilter/xt_recent.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_recent.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_recent.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_rpfilter.h b/ndk/platforms/android-21/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_rpfilter.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_rpfilter.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_sctp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_sctp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_sctp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_sctp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_set.h b/ndk/platforms/android-21/include/linux/netfilter/xt_set.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_set.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_set.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_socket.h b/ndk/platforms/android-21/include/linux/netfilter/xt_socket.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_socket.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_socket.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_state.h b/ndk/platforms/android-21/include/linux/netfilter/xt_state.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_state.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_state.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_statistic.h b/ndk/platforms/android-21/include/linux/netfilter/xt_statistic.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_statistic.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_statistic.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_string.h b/ndk/platforms/android-21/include/linux/netfilter/xt_string.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_string.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_string.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_tcpmss.h b/ndk/platforms/android-21/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_tcpmss.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_tcpmss.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_tcpudp.h b/ndk/platforms/android-21/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_tcpudp.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_tcpudp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_time.h b/ndk/platforms/android-21/include/linux/netfilter/xt_time.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_time.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_time.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter/xt_u32.h b/ndk/platforms/android-21/include/linux/netfilter/xt_u32.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter/xt_u32.h
rename to ndk/platforms/android-21/include/linux/netfilter/xt_u32.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_arp.h b/ndk/platforms/android-21/include/linux/netfilter_arp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_arp.h
rename to ndk/platforms/android-21/include/linux/netfilter_arp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_arp/arp_tables.h b/ndk/platforms/android-21/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_arp/arp_tables.h
rename to ndk/platforms/android-21/include/linux/netfilter_arp/arp_tables.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_arp/arpt_mangle.h b/ndk/platforms/android-21/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_arp/arpt_mangle.h
rename to ndk/platforms/android-21/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge.h b/ndk/platforms/android-21/include/linux/netfilter_bridge.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_802_3.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_802_3.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_among.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_among.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_among.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_arp.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_arp.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_arpreply.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_arpreply.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_ip.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_ip.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_ip6.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_ip6.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_limit.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_limit.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_log.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_log.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_log.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_mark_m.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_mark_m.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_mark_t.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_mark_t.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_nat.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_nat.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_nflog.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_nflog.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_pkttype.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_pkttype.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_redirect.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_redirect.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_stp.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_stp.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_ulog.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_ulog.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_vlan.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebt_vlan.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_bridge/ebtables.h b/ndk/platforms/android-21/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_bridge/ebtables.h
rename to ndk/platforms/android-21/include/linux/netfilter_bridge/ebtables.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_decnet.h b/ndk/platforms/android-21/include/linux/netfilter_decnet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_decnet.h
rename to ndk/platforms/android-21/include/linux/netfilter_decnet.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ip_tables.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ip_tables.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ECN.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ECN.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_LOG.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_LOG.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_REJECT.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_REJECT.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_TTL.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_TTL.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ULOG.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ULOG.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ah.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ah.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ecn.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ecn.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ttl.h b/ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv4/ipt_ttl.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6_tables.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6_tables.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_HL.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_HL.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_LOG.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_LOG.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_NPT.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_NPT.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_REJECT.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_REJECT.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_ah.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_ah.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_frag.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_frag.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_hl.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_hl.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_ipv6header.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_mh.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_mh.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_opts.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_opts.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_rt.h b/ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netfilter_ipv6/ip6t_rt.h
rename to ndk/platforms/android-21/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/ndk/platforms/android-L/include/linux/netlink.h b/ndk/platforms/android-21/include/linux/netlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netlink.h
rename to ndk/platforms/android-21/include/linux/netlink.h
diff --git a/ndk/platforms/android-L/include/linux/netlink_diag.h b/ndk/platforms/android-21/include/linux/netlink_diag.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netlink_diag.h
rename to ndk/platforms/android-21/include/linux/netlink_diag.h
diff --git a/ndk/platforms/android-L/include/linux/netrom.h b/ndk/platforms/android-21/include/linux/netrom.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/netrom.h
rename to ndk/platforms/android-21/include/linux/netrom.h
diff --git a/ndk/platforms/android-L/include/linux/nfc.h b/ndk/platforms/android-21/include/linux/nfc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfc.h
rename to ndk/platforms/android-21/include/linux/nfc.h
diff --git a/ndk/platforms/android-L/include/linux/nfs.h b/ndk/platforms/android-21/include/linux/nfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs.h
rename to ndk/platforms/android-21/include/linux/nfs.h
diff --git a/ndk/platforms/android-L/include/linux/nfs2.h b/ndk/platforms/android-21/include/linux/nfs2.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs2.h
rename to ndk/platforms/android-21/include/linux/nfs2.h
diff --git a/ndk/platforms/android-L/include/linux/nfs3.h b/ndk/platforms/android-21/include/linux/nfs3.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs3.h
rename to ndk/platforms/android-21/include/linux/nfs3.h
diff --git a/ndk/platforms/android-L/include/linux/nfs4.h b/ndk/platforms/android-21/include/linux/nfs4.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs4.h
rename to ndk/platforms/android-21/include/linux/nfs4.h
diff --git a/ndk/platforms/android-L/include/linux/nfs4_mount.h b/ndk/platforms/android-21/include/linux/nfs4_mount.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs4_mount.h
rename to ndk/platforms/android-21/include/linux/nfs4_mount.h
diff --git a/ndk/platforms/android-L/include/linux/nfs_fs.h b/ndk/platforms/android-21/include/linux/nfs_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs_fs.h
rename to ndk/platforms/android-21/include/linux/nfs_fs.h
diff --git a/ndk/platforms/android-L/include/linux/nfs_idmap.h b/ndk/platforms/android-21/include/linux/nfs_idmap.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs_idmap.h
rename to ndk/platforms/android-21/include/linux/nfs_idmap.h
diff --git a/ndk/platforms/android-L/include/linux/nfs_mount.h b/ndk/platforms/android-21/include/linux/nfs_mount.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfs_mount.h
rename to ndk/platforms/android-21/include/linux/nfs_mount.h
diff --git a/ndk/platforms/android-L/include/linux/nfsacl.h b/ndk/platforms/android-21/include/linux/nfsacl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfsacl.h
rename to ndk/platforms/android-21/include/linux/nfsacl.h
diff --git a/ndk/platforms/android-L/include/linux/nfsd/cld.h b/ndk/platforms/android-21/include/linux/nfsd/cld.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfsd/cld.h
rename to ndk/platforms/android-21/include/linux/nfsd/cld.h
diff --git a/ndk/platforms/android-L/include/linux/nfsd/debug.h b/ndk/platforms/android-21/include/linux/nfsd/debug.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfsd/debug.h
rename to ndk/platforms/android-21/include/linux/nfsd/debug.h
diff --git a/ndk/platforms/android-L/include/linux/nfsd/export.h b/ndk/platforms/android-21/include/linux/nfsd/export.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfsd/export.h
rename to ndk/platforms/android-21/include/linux/nfsd/export.h
diff --git a/ndk/platforms/android-L/include/linux/nfsd/nfsfh.h b/ndk/platforms/android-21/include/linux/nfsd/nfsfh.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfsd/nfsfh.h
rename to ndk/platforms/android-21/include/linux/nfsd/nfsfh.h
diff --git a/ndk/platforms/android-L/include/linux/nfsd/stats.h b/ndk/platforms/android-21/include/linux/nfsd/stats.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nfsd/stats.h
rename to ndk/platforms/android-21/include/linux/nfsd/stats.h
diff --git a/ndk/platforms/android-L/include/linux/nl80211.h b/ndk/platforms/android-21/include/linux/nl80211.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nl80211.h
rename to ndk/platforms/android-21/include/linux/nl80211.h
diff --git a/ndk/platforms/android-L/include/linux/nubus.h b/ndk/platforms/android-21/include/linux/nubus.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nubus.h
rename to ndk/platforms/android-21/include/linux/nubus.h
diff --git a/ndk/platforms/android-L/include/linux/nvme.h b/ndk/platforms/android-21/include/linux/nvme.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nvme.h
rename to ndk/platforms/android-21/include/linux/nvme.h
diff --git a/ndk/platforms/android-L/include/linux/nvram.h b/ndk/platforms/android-21/include/linux/nvram.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/nvram.h
rename to ndk/platforms/android-21/include/linux/nvram.h
diff --git a/ndk/platforms/android-L/include/linux/omap3isp.h b/ndk/platforms/android-21/include/linux/omap3isp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/omap3isp.h
rename to ndk/platforms/android-21/include/linux/omap3isp.h
diff --git a/ndk/platforms/android-L/include/linux/omapfb.h b/ndk/platforms/android-21/include/linux/omapfb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/omapfb.h
rename to ndk/platforms/android-21/include/linux/omapfb.h
diff --git a/ndk/platforms/android-L/include/linux/oom.h b/ndk/platforms/android-21/include/linux/oom.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/oom.h
rename to ndk/platforms/android-21/include/linux/oom.h
diff --git a/ndk/platforms/android-L/include/linux/openvswitch.h b/ndk/platforms/android-21/include/linux/openvswitch.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/openvswitch.h
rename to ndk/platforms/android-21/include/linux/openvswitch.h
diff --git a/ndk/platforms/android-L/include/linux/packet_diag.h b/ndk/platforms/android-21/include/linux/packet_diag.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/packet_diag.h
rename to ndk/platforms/android-21/include/linux/packet_diag.h
diff --git a/ndk/platforms/android-L/include/linux/param.h b/ndk/platforms/android-21/include/linux/param.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/param.h
rename to ndk/platforms/android-21/include/linux/param.h
diff --git a/ndk/platforms/android-L/include/linux/parport.h b/ndk/platforms/android-21/include/linux/parport.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/parport.h
rename to ndk/platforms/android-21/include/linux/parport.h
diff --git a/ndk/platforms/android-L/include/linux/patchkey.h b/ndk/platforms/android-21/include/linux/patchkey.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/patchkey.h
rename to ndk/platforms/android-21/include/linux/patchkey.h
diff --git a/ndk/platforms/android-L/include/linux/pci.h b/ndk/platforms/android-21/include/linux/pci.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pci.h
rename to ndk/platforms/android-21/include/linux/pci.h
diff --git a/ndk/platforms/android-L/include/linux/pci_regs.h b/ndk/platforms/android-21/include/linux/pci_regs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pci_regs.h
rename to ndk/platforms/android-21/include/linux/pci_regs.h
diff --git a/ndk/platforms/android-L/include/linux/perf_event.h b/ndk/platforms/android-21/include/linux/perf_event.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/perf_event.h
rename to ndk/platforms/android-21/include/linux/perf_event.h
diff --git a/ndk/platforms/android-L/include/linux/personality.h b/ndk/platforms/android-21/include/linux/personality.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/personality.h
rename to ndk/platforms/android-21/include/linux/personality.h
diff --git a/ndk/platforms/android-L/include/linux/pfkeyv2.h b/ndk/platforms/android-21/include/linux/pfkeyv2.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pfkeyv2.h
rename to ndk/platforms/android-21/include/linux/pfkeyv2.h
diff --git a/ndk/platforms/android-L/include/linux/pg.h b/ndk/platforms/android-21/include/linux/pg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pg.h
rename to ndk/platforms/android-21/include/linux/pg.h
diff --git a/ndk/platforms/android-L/include/linux/phantom.h b/ndk/platforms/android-21/include/linux/phantom.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/phantom.h
rename to ndk/platforms/android-21/include/linux/phantom.h
diff --git a/ndk/platforms/android-L/include/linux/phonet.h b/ndk/platforms/android-21/include/linux/phonet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/phonet.h
rename to ndk/platforms/android-21/include/linux/phonet.h
diff --git a/ndk/platforms/android-L/include/linux/pkt_cls.h b/ndk/platforms/android-21/include/linux/pkt_cls.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pkt_cls.h
rename to ndk/platforms/android-21/include/linux/pkt_cls.h
diff --git a/ndk/platforms/android-L/include/linux/pkt_sched.h b/ndk/platforms/android-21/include/linux/pkt_sched.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pkt_sched.h
rename to ndk/platforms/android-21/include/linux/pkt_sched.h
diff --git a/ndk/platforms/android-L/include/linux/pktcdvd.h b/ndk/platforms/android-21/include/linux/pktcdvd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pktcdvd.h
rename to ndk/platforms/android-21/include/linux/pktcdvd.h
diff --git a/ndk/platforms/android-L/include/linux/pmu.h b/ndk/platforms/android-21/include/linux/pmu.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pmu.h
rename to ndk/platforms/android-21/include/linux/pmu.h
diff --git a/ndk/platforms/android-L/include/linux/poll.h b/ndk/platforms/android-21/include/linux/poll.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/poll.h
rename to ndk/platforms/android-21/include/linux/poll.h
diff --git a/ndk/platforms/android-L/include/linux/posix_types.h b/ndk/platforms/android-21/include/linux/posix_types.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/posix_types.h
rename to ndk/platforms/android-21/include/linux/posix_types.h
diff --git a/ndk/platforms/android-L/include/linux/ppdev.h b/ndk/platforms/android-21/include/linux/ppdev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ppdev.h
rename to ndk/platforms/android-21/include/linux/ppdev.h
diff --git a/ndk/platforms/android-L/include/linux/ppp-comp.h b/ndk/platforms/android-21/include/linux/ppp-comp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ppp-comp.h
rename to ndk/platforms/android-21/include/linux/ppp-comp.h
diff --git a/ndk/platforms/android-L/include/linux/ppp-ioctl.h b/ndk/platforms/android-21/include/linux/ppp-ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ppp-ioctl.h
rename to ndk/platforms/android-21/include/linux/ppp-ioctl.h
diff --git a/ndk/platforms/android-L/include/linux/ppp_defs.h b/ndk/platforms/android-21/include/linux/ppp_defs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ppp_defs.h
rename to ndk/platforms/android-21/include/linux/ppp_defs.h
diff --git a/ndk/platforms/android-L/include/linux/pps.h b/ndk/platforms/android-21/include/linux/pps.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/pps.h
rename to ndk/platforms/android-21/include/linux/pps.h
diff --git a/ndk/platforms/android-L/include/linux/prctl.h b/ndk/platforms/android-21/include/linux/prctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/prctl.h
rename to ndk/platforms/android-21/include/linux/prctl.h
diff --git a/ndk/platforms/android-L/include/linux/ptp_clock.h b/ndk/platforms/android-21/include/linux/ptp_clock.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ptp_clock.h
rename to ndk/platforms/android-21/include/linux/ptp_clock.h
diff --git a/ndk/platforms/android-L/include/linux/ptrace.h b/ndk/platforms/android-21/include/linux/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ptrace.h
rename to ndk/platforms/android-21/include/linux/ptrace.h
diff --git a/ndk/platforms/android-L/include/linux/qnx4_fs.h b/ndk/platforms/android-21/include/linux/qnx4_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/qnx4_fs.h
rename to ndk/platforms/android-21/include/linux/qnx4_fs.h
diff --git a/ndk/platforms/android-L/include/linux/qnxtypes.h b/ndk/platforms/android-21/include/linux/qnxtypes.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/qnxtypes.h
rename to ndk/platforms/android-21/include/linux/qnxtypes.h
diff --git a/ndk/platforms/android-L/include/linux/quota.h b/ndk/platforms/android-21/include/linux/quota.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/quota.h
rename to ndk/platforms/android-21/include/linux/quota.h
diff --git a/ndk/platforms/android-L/include/linux/radeonfb.h b/ndk/platforms/android-21/include/linux/radeonfb.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/radeonfb.h
rename to ndk/platforms/android-21/include/linux/radeonfb.h
diff --git a/ndk/platforms/android-L/include/linux/raid/md_p.h b/ndk/platforms/android-21/include/linux/raid/md_p.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/raid/md_p.h
rename to ndk/platforms/android-21/include/linux/raid/md_p.h
diff --git a/ndk/platforms/android-L/include/linux/raid/md_u.h b/ndk/platforms/android-21/include/linux/raid/md_u.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/raid/md_u.h
rename to ndk/platforms/android-21/include/linux/raid/md_u.h
diff --git a/ndk/platforms/android-L/include/linux/random.h b/ndk/platforms/android-21/include/linux/random.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/random.h
rename to ndk/platforms/android-21/include/linux/random.h
diff --git a/ndk/platforms/android-L/include/linux/raw.h b/ndk/platforms/android-21/include/linux/raw.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/raw.h
rename to ndk/platforms/android-21/include/linux/raw.h
diff --git a/ndk/platforms/android-L/include/linux/rds.h b/ndk/platforms/android-21/include/linux/rds.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/rds.h
rename to ndk/platforms/android-21/include/linux/rds.h
diff --git a/ndk/platforms/android-L/include/linux/reboot.h b/ndk/platforms/android-21/include/linux/reboot.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/reboot.h
rename to ndk/platforms/android-21/include/linux/reboot.h
diff --git a/ndk/platforms/android-L/include/linux/reiserfs_fs.h b/ndk/platforms/android-21/include/linux/reiserfs_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/reiserfs_fs.h
rename to ndk/platforms/android-21/include/linux/reiserfs_fs.h
diff --git a/ndk/platforms/android-L/include/linux/reiserfs_xattr.h b/ndk/platforms/android-21/include/linux/reiserfs_xattr.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/reiserfs_xattr.h
rename to ndk/platforms/android-21/include/linux/reiserfs_xattr.h
diff --git a/ndk/platforms/android-L/include/linux/resource.h b/ndk/platforms/android-21/include/linux/resource.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/resource.h
rename to ndk/platforms/android-21/include/linux/resource.h
diff --git a/ndk/platforms/android-L/include/linux/rfkill.h b/ndk/platforms/android-21/include/linux/rfkill.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/rfkill.h
rename to ndk/platforms/android-21/include/linux/rfkill.h
diff --git a/ndk/platforms/android-L/include/linux/romfs_fs.h b/ndk/platforms/android-21/include/linux/romfs_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/romfs_fs.h
rename to ndk/platforms/android-21/include/linux/romfs_fs.h
diff --git a/ndk/platforms/android-L/include/linux/rose.h b/ndk/platforms/android-21/include/linux/rose.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/rose.h
rename to ndk/platforms/android-21/include/linux/rose.h
diff --git a/ndk/platforms/android-L/include/linux/route.h b/ndk/platforms/android-21/include/linux/route.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/route.h
rename to ndk/platforms/android-21/include/linux/route.h
diff --git a/ndk/platforms/android-L/include/linux/rtc.h b/ndk/platforms/android-21/include/linux/rtc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/rtc.h
rename to ndk/platforms/android-21/include/linux/rtc.h
diff --git a/ndk/platforms/android-L/include/linux/rtnetlink.h b/ndk/platforms/android-21/include/linux/rtnetlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/rtnetlink.h
rename to ndk/platforms/android-21/include/linux/rtnetlink.h
diff --git a/ndk/platforms/android-L/include/linux/scc.h b/ndk/platforms/android-21/include/linux/scc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/scc.h
rename to ndk/platforms/android-21/include/linux/scc.h
diff --git a/ndk/platforms/android-L/include/linux/sched.h b/ndk/platforms/android-21/include/linux/sched.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sched.h
rename to ndk/platforms/android-21/include/linux/sched.h
diff --git a/ndk/platforms/android-L/include/linux/screen_info.h b/ndk/platforms/android-21/include/linux/screen_info.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/screen_info.h
rename to ndk/platforms/android-21/include/linux/screen_info.h
diff --git a/ndk/platforms/android-L/include/linux/sctp.h b/ndk/platforms/android-21/include/linux/sctp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sctp.h
rename to ndk/platforms/android-21/include/linux/sctp.h
diff --git a/ndk/platforms/android-L/include/linux/sdla.h b/ndk/platforms/android-21/include/linux/sdla.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sdla.h
rename to ndk/platforms/android-21/include/linux/sdla.h
diff --git a/ndk/platforms/android-L/include/linux/seccomp.h b/ndk/platforms/android-21/include/linux/seccomp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/seccomp.h
rename to ndk/platforms/android-21/include/linux/seccomp.h
diff --git a/ndk/platforms/android-L/include/linux/securebits.h b/ndk/platforms/android-21/include/linux/securebits.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/securebits.h
rename to ndk/platforms/android-21/include/linux/securebits.h
diff --git a/ndk/platforms/android-L/include/linux/selinux_netlink.h b/ndk/platforms/android-21/include/linux/selinux_netlink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/selinux_netlink.h
rename to ndk/platforms/android-21/include/linux/selinux_netlink.h
diff --git a/ndk/platforms/android-L/include/linux/sem.h b/ndk/platforms/android-21/include/linux/sem.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sem.h
rename to ndk/platforms/android-21/include/linux/sem.h
diff --git a/ndk/platforms/android-L/include/linux/serial.h b/ndk/platforms/android-21/include/linux/serial.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/serial.h
rename to ndk/platforms/android-21/include/linux/serial.h
diff --git a/ndk/platforms/android-L/include/linux/serial_core.h b/ndk/platforms/android-21/include/linux/serial_core.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/serial_core.h
rename to ndk/platforms/android-21/include/linux/serial_core.h
diff --git a/ndk/platforms/android-L/include/linux/serial_reg.h b/ndk/platforms/android-21/include/linux/serial_reg.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/serial_reg.h
rename to ndk/platforms/android-21/include/linux/serial_reg.h
diff --git a/ndk/platforms/android-L/include/linux/serio.h b/ndk/platforms/android-21/include/linux/serio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/serio.h
rename to ndk/platforms/android-21/include/linux/serio.h
diff --git a/ndk/platforms/android-L/include/linux/shm.h b/ndk/platforms/android-21/include/linux/shm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/shm.h
rename to ndk/platforms/android-21/include/linux/shm.h
diff --git a/ndk/platforms/android-L/include/linux/signal.h b/ndk/platforms/android-21/include/linux/signal.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/signal.h
rename to ndk/platforms/android-21/include/linux/signal.h
diff --git a/ndk/platforms/android-L/include/linux/signalfd.h b/ndk/platforms/android-21/include/linux/signalfd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/signalfd.h
rename to ndk/platforms/android-21/include/linux/signalfd.h
diff --git a/ndk/platforms/android-L/include/linux/snmp.h b/ndk/platforms/android-21/include/linux/snmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/snmp.h
rename to ndk/platforms/android-21/include/linux/snmp.h
diff --git a/ndk/platforms/android-L/include/linux/sock_diag.h b/ndk/platforms/android-21/include/linux/sock_diag.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sock_diag.h
rename to ndk/platforms/android-21/include/linux/sock_diag.h
diff --git a/ndk/platforms/android-L/include/linux/socket.h b/ndk/platforms/android-21/include/linux/socket.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/socket.h
rename to ndk/platforms/android-21/include/linux/socket.h
diff --git a/ndk/platforms/android-L/include/linux/sockios.h b/ndk/platforms/android-21/include/linux/sockios.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sockios.h
rename to ndk/platforms/android-21/include/linux/sockios.h
diff --git a/ndk/platforms/android-L/include/linux/som.h b/ndk/platforms/android-21/include/linux/som.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/som.h
rename to ndk/platforms/android-21/include/linux/som.h
diff --git a/ndk/platforms/android-L/include/linux/sonet.h b/ndk/platforms/android-21/include/linux/sonet.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sonet.h
rename to ndk/platforms/android-21/include/linux/sonet.h
diff --git a/ndk/platforms/android-L/include/linux/sonypi.h b/ndk/platforms/android-21/include/linux/sonypi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sonypi.h
rename to ndk/platforms/android-21/include/linux/sonypi.h
diff --git a/ndk/platforms/android-L/include/linux/sound.h b/ndk/platforms/android-21/include/linux/sound.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sound.h
rename to ndk/platforms/android-21/include/linux/sound.h
diff --git a/ndk/platforms/android-L/include/linux/soundcard.h b/ndk/platforms/android-21/include/linux/soundcard.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/soundcard.h
rename to ndk/platforms/android-21/include/linux/soundcard.h
diff --git a/ndk/platforms/android-L/include/linux/spi/spidev.h b/ndk/platforms/android-21/include/linux/spi/spidev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/spi/spidev.h
rename to ndk/platforms/android-21/include/linux/spi/spidev.h
diff --git a/ndk/platforms/android-L/include/linux/stat.h b/ndk/platforms/android-21/include/linux/stat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/stat.h
rename to ndk/platforms/android-21/include/linux/stat.h
diff --git a/ndk/platforms/android-L/include/linux/stddef.h b/ndk/platforms/android-21/include/linux/stddef.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/stddef.h
rename to ndk/platforms/android-21/include/linux/stddef.h
diff --git a/ndk/platforms/android-L/include/linux/string.h b/ndk/platforms/android-21/include/linux/string.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/string.h
rename to ndk/platforms/android-21/include/linux/string.h
diff --git a/ndk/platforms/android-L/include/linux/sunrpc/debug.h b/ndk/platforms/android-21/include/linux/sunrpc/debug.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sunrpc/debug.h
rename to ndk/platforms/android-21/include/linux/sunrpc/debug.h
diff --git a/ndk/platforms/android-L/include/linux/suspend_ioctls.h b/ndk/platforms/android-21/include/linux/suspend_ioctls.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/suspend_ioctls.h
rename to ndk/platforms/android-21/include/linux/suspend_ioctls.h
diff --git a/ndk/platforms/android-L/include/linux/sw_sync.h b/ndk/platforms/android-21/include/linux/sw_sync.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sw_sync.h
rename to ndk/platforms/android-21/include/linux/sw_sync.h
diff --git a/ndk/platforms/android-L/include/linux/swab.h b/ndk/platforms/android-21/include/linux/swab.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/swab.h
rename to ndk/platforms/android-21/include/linux/swab.h
diff --git a/ndk/platforms/android-L/include/linux/sync.h b/ndk/platforms/android-21/include/linux/sync.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sync.h
rename to ndk/platforms/android-21/include/linux/sync.h
diff --git a/ndk/platforms/android-L/include/linux/synclink.h b/ndk/platforms/android-21/include/linux/synclink.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/synclink.h
rename to ndk/platforms/android-21/include/linux/synclink.h
diff --git a/ndk/platforms/android-L/include/linux/sysctl.h b/ndk/platforms/android-21/include/linux/sysctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sysctl.h
rename to ndk/platforms/android-21/include/linux/sysctl.h
diff --git a/ndk/platforms/android-L/include/linux/sysinfo.h b/ndk/platforms/android-21/include/linux/sysinfo.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/sysinfo.h
rename to ndk/platforms/android-21/include/linux/sysinfo.h
diff --git a/ndk/platforms/android-L/include/linux/taskstats.h b/ndk/platforms/android-21/include/linux/taskstats.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/taskstats.h
rename to ndk/platforms/android-21/include/linux/taskstats.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_csum.h b/ndk/platforms/android-21/include/linux/tc_act/tc_csum.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_csum.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_csum.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_defact.h b/ndk/platforms/android-21/include/linux/tc_act/tc_defact.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_defact.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_defact.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_gact.h b/ndk/platforms/android-21/include/linux/tc_act/tc_gact.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_gact.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_gact.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_ipt.h b/ndk/platforms/android-21/include/linux/tc_act/tc_ipt.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_ipt.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_ipt.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_mirred.h b/ndk/platforms/android-21/include/linux/tc_act/tc_mirred.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_mirred.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_mirred.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_nat.h b/ndk/platforms/android-21/include/linux/tc_act/tc_nat.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_nat.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_nat.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_pedit.h b/ndk/platforms/android-21/include/linux/tc_act/tc_pedit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_pedit.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_pedit.h
diff --git a/ndk/platforms/android-L/include/linux/tc_act/tc_skbedit.h b/ndk/platforms/android-21/include/linux/tc_act/tc_skbedit.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_act/tc_skbedit.h
rename to ndk/platforms/android-21/include/linux/tc_act/tc_skbedit.h
diff --git a/ndk/platforms/android-L/include/linux/tc_ematch/tc_em_cmp.h b/ndk/platforms/android-21/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_ematch/tc_em_cmp.h
rename to ndk/platforms/android-21/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/ndk/platforms/android-L/include/linux/tc_ematch/tc_em_meta.h b/ndk/platforms/android-21/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_ematch/tc_em_meta.h
rename to ndk/platforms/android-21/include/linux/tc_ematch/tc_em_meta.h
diff --git a/ndk/platforms/android-L/include/linux/tc_ematch/tc_em_nbyte.h b/ndk/platforms/android-21/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_ematch/tc_em_nbyte.h
rename to ndk/platforms/android-21/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/ndk/platforms/android-L/include/linux/tc_ematch/tc_em_text.h b/ndk/platforms/android-21/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tc_ematch/tc_em_text.h
rename to ndk/platforms/android-21/include/linux/tc_ematch/tc_em_text.h
diff --git a/ndk/platforms/android-L/include/linux/tcp.h b/ndk/platforms/android-21/include/linux/tcp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tcp.h
rename to ndk/platforms/android-21/include/linux/tcp.h
diff --git a/ndk/platforms/android-L/include/linux/tcp_metrics.h b/ndk/platforms/android-21/include/linux/tcp_metrics.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tcp_metrics.h
rename to ndk/platforms/android-21/include/linux/tcp_metrics.h
diff --git a/ndk/platforms/android-L/include/linux/telephony.h b/ndk/platforms/android-21/include/linux/telephony.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/telephony.h
rename to ndk/platforms/android-21/include/linux/telephony.h
diff --git a/ndk/platforms/android-L/include/linux/termios.h b/ndk/platforms/android-21/include/linux/termios.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/termios.h
rename to ndk/platforms/android-21/include/linux/termios.h
diff --git a/ndk/platforms/android-L/include/linux/time.h b/ndk/platforms/android-21/include/linux/time.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/time.h
rename to ndk/platforms/android-21/include/linux/time.h
diff --git a/ndk/platforms/android-L/include/linux/times.h b/ndk/platforms/android-21/include/linux/times.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/times.h
rename to ndk/platforms/android-21/include/linux/times.h
diff --git a/ndk/platforms/android-L/include/linux/timex.h b/ndk/platforms/android-21/include/linux/timex.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/timex.h
rename to ndk/platforms/android-21/include/linux/timex.h
diff --git a/ndk/platforms/android-L/include/linux/tiocl.h b/ndk/platforms/android-21/include/linux/tiocl.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tiocl.h
rename to ndk/platforms/android-21/include/linux/tiocl.h
diff --git a/ndk/platforms/android-L/include/linux/tipc.h b/ndk/platforms/android-21/include/linux/tipc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tipc.h
rename to ndk/platforms/android-21/include/linux/tipc.h
diff --git a/ndk/platforms/android-L/include/linux/tipc_config.h b/ndk/platforms/android-21/include/linux/tipc_config.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tipc_config.h
rename to ndk/platforms/android-21/include/linux/tipc_config.h
diff --git a/ndk/platforms/android-L/include/linux/toshiba.h b/ndk/platforms/android-21/include/linux/toshiba.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/toshiba.h
rename to ndk/platforms/android-21/include/linux/toshiba.h
diff --git a/ndk/platforms/android-L/include/linux/tty.h b/ndk/platforms/android-21/include/linux/tty.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tty.h
rename to ndk/platforms/android-21/include/linux/tty.h
diff --git a/ndk/platforms/android-L/include/linux/tty_flags.h b/ndk/platforms/android-21/include/linux/tty_flags.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/tty_flags.h
rename to ndk/platforms/android-21/include/linux/tty_flags.h
diff --git a/ndk/platforms/android-L/include/linux/types.h b/ndk/platforms/android-21/include/linux/types.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/types.h
rename to ndk/platforms/android-21/include/linux/types.h
diff --git a/ndk/platforms/android-L/include/linux/udf_fs_i.h b/ndk/platforms/android-21/include/linux/udf_fs_i.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/udf_fs_i.h
rename to ndk/platforms/android-21/include/linux/udf_fs_i.h
diff --git a/ndk/platforms/android-L/include/linux/udp.h b/ndk/platforms/android-21/include/linux/udp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/udp.h
rename to ndk/platforms/android-21/include/linux/udp.h
diff --git a/ndk/platforms/android-L/include/linux/uhid.h b/ndk/platforms/android-21/include/linux/uhid.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/uhid.h
rename to ndk/platforms/android-21/include/linux/uhid.h
diff --git a/ndk/platforms/android-L/include/linux/uinput.h b/ndk/platforms/android-21/include/linux/uinput.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/uinput.h
rename to ndk/platforms/android-21/include/linux/uinput.h
diff --git a/ndk/platforms/android-L/include/linux/uio.h b/ndk/platforms/android-21/include/linux/uio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/uio.h
rename to ndk/platforms/android-21/include/linux/uio.h
diff --git a/ndk/platforms/android-L/include/linux/ultrasound.h b/ndk/platforms/android-21/include/linux/ultrasound.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/ultrasound.h
rename to ndk/platforms/android-21/include/linux/ultrasound.h
diff --git a/ndk/platforms/android-L/include/linux/un.h b/ndk/platforms/android-21/include/linux/un.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/un.h
rename to ndk/platforms/android-21/include/linux/un.h
diff --git a/ndk/platforms/android-L/include/linux/unistd.h b/ndk/platforms/android-21/include/linux/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/unistd.h
rename to ndk/platforms/android-21/include/linux/unistd.h
diff --git a/ndk/platforms/android-L/include/linux/unix_diag.h b/ndk/platforms/android-21/include/linux/unix_diag.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/unix_diag.h
rename to ndk/platforms/android-21/include/linux/unix_diag.h
diff --git a/ndk/platforms/android-L/include/linux/usb/audio.h b/ndk/platforms/android-21/include/linux/usb/audio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/audio.h
rename to ndk/platforms/android-21/include/linux/usb/audio.h
diff --git a/ndk/platforms/android-L/include/linux/usb/cdc-wdm.h b/ndk/platforms/android-21/include/linux/usb/cdc-wdm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/cdc-wdm.h
rename to ndk/platforms/android-21/include/linux/usb/cdc-wdm.h
diff --git a/ndk/platforms/android-L/include/linux/usb/cdc.h b/ndk/platforms/android-21/include/linux/usb/cdc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/cdc.h
rename to ndk/platforms/android-21/include/linux/usb/cdc.h
diff --git a/ndk/platforms/android-L/include/linux/usb/ch11.h b/ndk/platforms/android-21/include/linux/usb/ch11.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/ch11.h
rename to ndk/platforms/android-21/include/linux/usb/ch11.h
diff --git a/ndk/platforms/android-L/include/linux/usb/ch9.h b/ndk/platforms/android-21/include/linux/usb/ch9.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/ch9.h
rename to ndk/platforms/android-21/include/linux/usb/ch9.h
diff --git a/ndk/platforms/android-L/include/linux/usb/f_accessory.h b/ndk/platforms/android-21/include/linux/usb/f_accessory.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/f_accessory.h
rename to ndk/platforms/android-21/include/linux/usb/f_accessory.h
diff --git a/ndk/platforms/android-L/include/linux/usb/f_mtp.h b/ndk/platforms/android-21/include/linux/usb/f_mtp.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/f_mtp.h
rename to ndk/platforms/android-21/include/linux/usb/f_mtp.h
diff --git a/ndk/platforms/android-L/include/linux/usb/functionfs.h b/ndk/platforms/android-21/include/linux/usb/functionfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/functionfs.h
rename to ndk/platforms/android-21/include/linux/usb/functionfs.h
diff --git a/ndk/platforms/android-L/include/linux/usb/g_printer.h b/ndk/platforms/android-21/include/linux/usb/g_printer.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/g_printer.h
rename to ndk/platforms/android-21/include/linux/usb/g_printer.h
diff --git a/ndk/platforms/android-L/include/linux/usb/gadgetfs.h b/ndk/platforms/android-21/include/linux/usb/gadgetfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/gadgetfs.h
rename to ndk/platforms/android-21/include/linux/usb/gadgetfs.h
diff --git a/ndk/platforms/android-L/include/linux/usb/midi.h b/ndk/platforms/android-21/include/linux/usb/midi.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/midi.h
rename to ndk/platforms/android-21/include/linux/usb/midi.h
diff --git a/ndk/platforms/android-L/include/linux/usb/tmc.h b/ndk/platforms/android-21/include/linux/usb/tmc.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/tmc.h
rename to ndk/platforms/android-21/include/linux/usb/tmc.h
diff --git a/ndk/platforms/android-L/include/linux/usb/video.h b/ndk/platforms/android-21/include/linux/usb/video.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usb/video.h
rename to ndk/platforms/android-21/include/linux/usb/video.h
diff --git a/ndk/platforms/android-L/include/linux/usbdevice_fs.h b/ndk/platforms/android-21/include/linux/usbdevice_fs.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/usbdevice_fs.h
rename to ndk/platforms/android-21/include/linux/usbdevice_fs.h
diff --git a/ndk/platforms/android-L/include/linux/utime.h b/ndk/platforms/android-21/include/linux/utime.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/utime.h
rename to ndk/platforms/android-21/include/linux/utime.h
diff --git a/ndk/platforms/android-L/include/linux/utsname.h b/ndk/platforms/android-21/include/linux/utsname.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/utsname.h
rename to ndk/platforms/android-21/include/linux/utsname.h
diff --git a/ndk/platforms/android-L/include/linux/uuid.h b/ndk/platforms/android-21/include/linux/uuid.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/uuid.h
rename to ndk/platforms/android-21/include/linux/uuid.h
diff --git a/ndk/platforms/android-L/include/linux/uvcvideo.h b/ndk/platforms/android-21/include/linux/uvcvideo.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/uvcvideo.h
rename to ndk/platforms/android-21/include/linux/uvcvideo.h
diff --git a/ndk/platforms/android-L/include/linux/v4l2-common.h b/ndk/platforms/android-21/include/linux/v4l2-common.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/v4l2-common.h
rename to ndk/platforms/android-21/include/linux/v4l2-common.h
diff --git a/ndk/platforms/android-L/include/linux/v4l2-controls.h b/ndk/platforms/android-21/include/linux/v4l2-controls.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/v4l2-controls.h
rename to ndk/platforms/android-21/include/linux/v4l2-controls.h
diff --git a/ndk/platforms/android-L/include/linux/v4l2-dv-timings.h b/ndk/platforms/android-21/include/linux/v4l2-dv-timings.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/v4l2-dv-timings.h
rename to ndk/platforms/android-21/include/linux/v4l2-dv-timings.h
diff --git a/ndk/platforms/android-L/include/linux/v4l2-mediabus.h b/ndk/platforms/android-21/include/linux/v4l2-mediabus.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/v4l2-mediabus.h
rename to ndk/platforms/android-21/include/linux/v4l2-mediabus.h
diff --git a/ndk/platforms/android-L/include/linux/v4l2-subdev.h b/ndk/platforms/android-21/include/linux/v4l2-subdev.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/v4l2-subdev.h
rename to ndk/platforms/android-21/include/linux/v4l2-subdev.h
diff --git a/ndk/platforms/android-L/include/linux/version.h b/ndk/platforms/android-21/include/linux/version.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/version.h
rename to ndk/platforms/android-21/include/linux/version.h
diff --git a/ndk/platforms/android-L/include/linux/veth.h b/ndk/platforms/android-21/include/linux/veth.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/veth.h
rename to ndk/platforms/android-21/include/linux/veth.h
diff --git a/ndk/platforms/android-L/include/linux/vfio.h b/ndk/platforms/android-21/include/linux/vfio.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/vfio.h
rename to ndk/platforms/android-21/include/linux/vfio.h
diff --git a/ndk/platforms/android-L/include/linux/vhost.h b/ndk/platforms/android-21/include/linux/vhost.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/vhost.h
rename to ndk/platforms/android-21/include/linux/vhost.h
diff --git a/ndk/platforms/android-L/include/linux/videodev2.h b/ndk/platforms/android-21/include/linux/videodev2.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/videodev2.h
rename to ndk/platforms/android-21/include/linux/videodev2.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_9p.h b/ndk/platforms/android-21/include/linux/virtio_9p.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_9p.h
rename to ndk/platforms/android-21/include/linux/virtio_9p.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_balloon.h b/ndk/platforms/android-21/include/linux/virtio_balloon.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_balloon.h
rename to ndk/platforms/android-21/include/linux/virtio_balloon.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_blk.h b/ndk/platforms/android-21/include/linux/virtio_blk.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_blk.h
rename to ndk/platforms/android-21/include/linux/virtio_blk.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_config.h b/ndk/platforms/android-21/include/linux/virtio_config.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_config.h
rename to ndk/platforms/android-21/include/linux/virtio_config.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_console.h b/ndk/platforms/android-21/include/linux/virtio_console.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_console.h
rename to ndk/platforms/android-21/include/linux/virtio_console.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_ids.h b/ndk/platforms/android-21/include/linux/virtio_ids.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_ids.h
rename to ndk/platforms/android-21/include/linux/virtio_ids.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_net.h b/ndk/platforms/android-21/include/linux/virtio_net.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_net.h
rename to ndk/platforms/android-21/include/linux/virtio_net.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_pci.h b/ndk/platforms/android-21/include/linux/virtio_pci.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_pci.h
rename to ndk/platforms/android-21/include/linux/virtio_pci.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_ring.h b/ndk/platforms/android-21/include/linux/virtio_ring.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_ring.h
rename to ndk/platforms/android-21/include/linux/virtio_ring.h
diff --git a/ndk/platforms/android-L/include/linux/virtio_rng.h b/ndk/platforms/android-21/include/linux/virtio_rng.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/virtio_rng.h
rename to ndk/platforms/android-21/include/linux/virtio_rng.h
diff --git a/ndk/platforms/android-L/include/linux/vm_sockets.h b/ndk/platforms/android-21/include/linux/vm_sockets.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/vm_sockets.h
rename to ndk/platforms/android-21/include/linux/vm_sockets.h
diff --git a/ndk/platforms/android-L/include/linux/vsp1.h b/ndk/platforms/android-21/include/linux/vsp1.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/vsp1.h
rename to ndk/platforms/android-21/include/linux/vsp1.h
diff --git a/ndk/platforms/android-L/include/linux/vt.h b/ndk/platforms/android-21/include/linux/vt.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/vt.h
rename to ndk/platforms/android-21/include/linux/vt.h
diff --git a/ndk/platforms/android-L/include/linux/wait.h b/ndk/platforms/android-21/include/linux/wait.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/wait.h
rename to ndk/platforms/android-21/include/linux/wait.h
diff --git a/ndk/platforms/android-L/include/linux/wanrouter.h b/ndk/platforms/android-21/include/linux/wanrouter.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/wanrouter.h
rename to ndk/platforms/android-21/include/linux/wanrouter.h
diff --git a/ndk/platforms/android-L/include/linux/watchdog.h b/ndk/platforms/android-21/include/linux/watchdog.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/watchdog.h
rename to ndk/platforms/android-21/include/linux/watchdog.h
diff --git a/ndk/platforms/android-L/include/linux/wimax.h b/ndk/platforms/android-21/include/linux/wimax.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/wimax.h
rename to ndk/platforms/android-21/include/linux/wimax.h
diff --git a/ndk/platforms/android-L/include/linux/wimax/i2400m.h b/ndk/platforms/android-21/include/linux/wimax/i2400m.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/wimax/i2400m.h
rename to ndk/platforms/android-21/include/linux/wimax/i2400m.h
diff --git a/ndk/platforms/android-L/include/linux/wireless.h b/ndk/platforms/android-21/include/linux/wireless.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/wireless.h
rename to ndk/platforms/android-21/include/linux/wireless.h
diff --git a/ndk/platforms/android-L/include/linux/x25.h b/ndk/platforms/android-21/include/linux/x25.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/x25.h
rename to ndk/platforms/android-21/include/linux/x25.h
diff --git a/ndk/platforms/android-L/include/linux/xattr.h b/ndk/platforms/android-21/include/linux/xattr.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/xattr.h
rename to ndk/platforms/android-21/include/linux/xattr.h
diff --git a/ndk/platforms/android-L/include/linux/xfrm.h b/ndk/platforms/android-21/include/linux/xfrm.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/xfrm.h
rename to ndk/platforms/android-21/include/linux/xfrm.h
diff --git a/ndk/platforms/android-L/include/linux/zorro.h b/ndk/platforms/android-21/include/linux/zorro.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/zorro.h
rename to ndk/platforms/android-21/include/linux/zorro.h
diff --git a/ndk/platforms/android-L/include/linux/zorro_ids.h b/ndk/platforms/android-21/include/linux/zorro_ids.h
similarity index 100%
rename from ndk/platforms/android-L/include/linux/zorro_ids.h
rename to ndk/platforms/android-21/include/linux/zorro_ids.h
diff --git a/ndk/platforms/android-L/include/locale.h b/ndk/platforms/android-21/include/locale.h
similarity index 100%
rename from ndk/platforms/android-L/include/locale.h
rename to ndk/platforms/android-21/include/locale.h
diff --git a/ndk/platforms/android-L/include/machine/ieee.h b/ndk/platforms/android-21/include/machine/ieee.h
similarity index 100%
rename from ndk/platforms/android-L/include/machine/ieee.h
rename to ndk/platforms/android-21/include/machine/ieee.h
diff --git a/ndk/platforms/android-L/include/machine/wchar_limits.h b/ndk/platforms/android-21/include/machine/wchar_limits.h
similarity index 100%
rename from ndk/platforms/android-L/include/machine/wchar_limits.h
rename to ndk/platforms/android-21/include/machine/wchar_limits.h
diff --git a/ndk/platforms/android-L/include/malloc.h b/ndk/platforms/android-21/include/malloc.h
similarity index 100%
rename from ndk/platforms/android-L/include/malloc.h
rename to ndk/platforms/android-21/include/malloc.h
diff --git a/ndk/platforms/android-L/include/math.h b/ndk/platforms/android-21/include/math.h
similarity index 100%
rename from ndk/platforms/android-L/include/math.h
rename to ndk/platforms/android-21/include/math.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaCodec.h b/ndk/platforms/android-21/include/media/NdkMediaCodec.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaCodec.h
rename to ndk/platforms/android-21/include/media/NdkMediaCodec.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaCrypto.h b/ndk/platforms/android-21/include/media/NdkMediaCrypto.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaCrypto.h
rename to ndk/platforms/android-21/include/media/NdkMediaCrypto.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaDrm.h b/ndk/platforms/android-21/include/media/NdkMediaDrm.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaDrm.h
rename to ndk/platforms/android-21/include/media/NdkMediaDrm.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaError.h b/ndk/platforms/android-21/include/media/NdkMediaError.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaError.h
rename to ndk/platforms/android-21/include/media/NdkMediaError.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaExtractor.h b/ndk/platforms/android-21/include/media/NdkMediaExtractor.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaExtractor.h
rename to ndk/platforms/android-21/include/media/NdkMediaExtractor.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaFormat.h b/ndk/platforms/android-21/include/media/NdkMediaFormat.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaFormat.h
rename to ndk/platforms/android-21/include/media/NdkMediaFormat.h
diff --git a/ndk/platforms/android-L/include/media/NdkMediaMuxer.h b/ndk/platforms/android-21/include/media/NdkMediaMuxer.h
similarity index 100%
rename from ndk/platforms/android-L/include/media/NdkMediaMuxer.h
rename to ndk/platforms/android-21/include/media/NdkMediaMuxer.h
diff --git a/ndk/platforms/android-L/include/memory.h b/ndk/platforms/android-21/include/memory.h
similarity index 100%
rename from ndk/platforms/android-L/include/memory.h
rename to ndk/platforms/android-21/include/memory.h
diff --git a/ndk/platforms/android-L/include/mntent.h b/ndk/platforms/android-21/include/mntent.h
similarity index 100%
rename from ndk/platforms/android-L/include/mntent.h
rename to ndk/platforms/android-21/include/mntent.h
diff --git a/ndk/platforms/android-L/include/net/ethernet.h b/ndk/platforms/android-21/include/net/ethernet.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/ethernet.h
rename to ndk/platforms/android-21/include/net/ethernet.h
diff --git a/ndk/platforms/android-L/include/net/ethertypes.h b/ndk/platforms/android-21/include/net/ethertypes.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/ethertypes.h
rename to ndk/platforms/android-21/include/net/ethertypes.h
diff --git a/ndk/platforms/android-L/include/net/if.h b/ndk/platforms/android-21/include/net/if.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/if.h
rename to ndk/platforms/android-21/include/net/if.h
diff --git a/ndk/platforms/android-L/include/net/if_arp.h b/ndk/platforms/android-21/include/net/if_arp.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/if_arp.h
rename to ndk/platforms/android-21/include/net/if_arp.h
diff --git a/ndk/platforms/android-L/include/net/if_ether.h b/ndk/platforms/android-21/include/net/if_ether.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/if_ether.h
rename to ndk/platforms/android-21/include/net/if_ether.h
diff --git a/ndk/platforms/android-L/include/net/if_ieee1394.h b/ndk/platforms/android-21/include/net/if_ieee1394.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/if_ieee1394.h
rename to ndk/platforms/android-21/include/net/if_ieee1394.h
diff --git a/ndk/platforms/android-L/include/net/if_packet.h b/ndk/platforms/android-21/include/net/if_packet.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/if_packet.h
rename to ndk/platforms/android-21/include/net/if_packet.h
diff --git a/ndk/platforms/android-L/include/net/if_types.h b/ndk/platforms/android-21/include/net/if_types.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/if_types.h
rename to ndk/platforms/android-21/include/net/if_types.h
diff --git a/ndk/platforms/android-L/include/net/route.h b/ndk/platforms/android-21/include/net/route.h
similarity index 100%
rename from ndk/platforms/android-L/include/net/route.h
rename to ndk/platforms/android-21/include/net/route.h
diff --git a/ndk/platforms/android-L/include/netdb.h b/ndk/platforms/android-21/include/netdb.h
similarity index 100%
rename from ndk/platforms/android-L/include/netdb.h
rename to ndk/platforms/android-21/include/netdb.h
diff --git a/ndk/platforms/android-L/include/netinet/ether.h b/ndk/platforms/android-21/include/netinet/ether.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/ether.h
rename to ndk/platforms/android-21/include/netinet/ether.h
diff --git a/ndk/platforms/android-L/include/netinet/icmp6.h b/ndk/platforms/android-21/include/netinet/icmp6.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/icmp6.h
rename to ndk/platforms/android-21/include/netinet/icmp6.h
diff --git a/ndk/platforms/android-L/include/netinet/if_ether.h b/ndk/platforms/android-21/include/netinet/if_ether.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/if_ether.h
rename to ndk/platforms/android-21/include/netinet/if_ether.h
diff --git a/ndk/platforms/android-L/include/netinet/in.h b/ndk/platforms/android-21/include/netinet/in.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/in.h
rename to ndk/platforms/android-21/include/netinet/in.h
diff --git a/ndk/platforms/android-L/include/netinet/in6.h b/ndk/platforms/android-21/include/netinet/in6.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/in6.h
rename to ndk/platforms/android-21/include/netinet/in6.h
diff --git a/ndk/platforms/android-L/include/netinet/in_systm.h b/ndk/platforms/android-21/include/netinet/in_systm.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/in_systm.h
rename to ndk/platforms/android-21/include/netinet/in_systm.h
diff --git a/ndk/platforms/android-L/include/netinet/ip.h b/ndk/platforms/android-21/include/netinet/ip.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/ip.h
rename to ndk/platforms/android-21/include/netinet/ip.h
diff --git a/ndk/platforms/android-L/include/netinet/ip6.h b/ndk/platforms/android-21/include/netinet/ip6.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/ip6.h
rename to ndk/platforms/android-21/include/netinet/ip6.h
diff --git a/ndk/platforms/android-L/include/netinet/ip_icmp.h b/ndk/platforms/android-21/include/netinet/ip_icmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/ip_icmp.h
rename to ndk/platforms/android-21/include/netinet/ip_icmp.h
diff --git a/ndk/platforms/android-L/include/netinet/tcp.h b/ndk/platforms/android-21/include/netinet/tcp.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/tcp.h
rename to ndk/platforms/android-21/include/netinet/tcp.h
diff --git a/ndk/platforms/android-L/include/netinet/udp.h b/ndk/platforms/android-21/include/netinet/udp.h
similarity index 100%
rename from ndk/platforms/android-L/include/netinet/udp.h
rename to ndk/platforms/android-21/include/netinet/udp.h
diff --git a/ndk/platforms/android-L/include/netpacket/packet.h b/ndk/platforms/android-21/include/netpacket/packet.h
similarity index 100%
rename from ndk/platforms/android-L/include/netpacket/packet.h
rename to ndk/platforms/android-21/include/netpacket/packet.h
diff --git a/ndk/platforms/android-L/include/nsswitch.h b/ndk/platforms/android-21/include/nsswitch.h
similarity index 100%
rename from ndk/platforms/android-L/include/nsswitch.h
rename to ndk/platforms/android-21/include/nsswitch.h
diff --git a/ndk/platforms/android-L/include/pathconf.h b/ndk/platforms/android-21/include/pathconf.h
similarity index 100%
rename from ndk/platforms/android-L/include/pathconf.h
rename to ndk/platforms/android-21/include/pathconf.h
diff --git a/ndk/platforms/android-L/include/paths.h b/ndk/platforms/android-21/include/paths.h
similarity index 100%
rename from ndk/platforms/android-L/include/paths.h
rename to ndk/platforms/android-21/include/paths.h
diff --git a/ndk/platforms/android-L/include/poll.h b/ndk/platforms/android-21/include/poll.h
similarity index 100%
rename from ndk/platforms/android-L/include/poll.h
rename to ndk/platforms/android-21/include/poll.h
diff --git a/ndk/platforms/android-L/include/pthread.h b/ndk/platforms/android-21/include/pthread.h
similarity index 100%
rename from ndk/platforms/android-L/include/pthread.h
rename to ndk/platforms/android-21/include/pthread.h
diff --git a/ndk/platforms/android-L/include/pwd.h b/ndk/platforms/android-21/include/pwd.h
similarity index 100%
rename from ndk/platforms/android-L/include/pwd.h
rename to ndk/platforms/android-21/include/pwd.h
diff --git a/ndk/platforms/android-L/include/regex.h b/ndk/platforms/android-21/include/regex.h
similarity index 100%
rename from ndk/platforms/android-L/include/regex.h
rename to ndk/platforms/android-21/include/regex.h
diff --git a/ndk/platforms/android-L/include/resolv.h b/ndk/platforms/android-21/include/resolv.h
similarity index 100%
rename from ndk/platforms/android-L/include/resolv.h
rename to ndk/platforms/android-21/include/resolv.h
diff --git a/ndk/platforms/android-L/include/sched.h b/ndk/platforms/android-21/include/sched.h
similarity index 100%
rename from ndk/platforms/android-L/include/sched.h
rename to ndk/platforms/android-21/include/sched.h
diff --git a/ndk/platforms/android-L/include/search.h b/ndk/platforms/android-21/include/search.h
similarity index 100%
rename from ndk/platforms/android-L/include/search.h
rename to ndk/platforms/android-21/include/search.h
diff --git a/ndk/platforms/android-L/include/semaphore.h b/ndk/platforms/android-21/include/semaphore.h
similarity index 100%
rename from ndk/platforms/android-L/include/semaphore.h
rename to ndk/platforms/android-21/include/semaphore.h
diff --git a/ndk/platforms/android-L/include/setjmp.h b/ndk/platforms/android-21/include/setjmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/setjmp.h
rename to ndk/platforms/android-21/include/setjmp.h
diff --git a/ndk/platforms/android-L/include/sgidefs.h b/ndk/platforms/android-21/include/sgidefs.h
similarity index 100%
rename from ndk/platforms/android-L/include/sgidefs.h
rename to ndk/platforms/android-21/include/sgidefs.h
diff --git a/ndk/platforms/android-L/include/sgtty.h b/ndk/platforms/android-21/include/sgtty.h
similarity index 100%
rename from ndk/platforms/android-L/include/sgtty.h
rename to ndk/platforms/android-21/include/sgtty.h
diff --git a/ndk/platforms/android-L/include/signal.h b/ndk/platforms/android-21/include/signal.h
similarity index 100%
rename from ndk/platforms/android-L/include/signal.h
rename to ndk/platforms/android-21/include/signal.h
diff --git a/ndk/platforms/android-L/include/stdatomic.h b/ndk/platforms/android-21/include/stdatomic.h
similarity index 100%
rename from ndk/platforms/android-L/include/stdatomic.h
rename to ndk/platforms/android-21/include/stdatomic.h
diff --git a/ndk/platforms/android-L/include/stdint.h b/ndk/platforms/android-21/include/stdint.h
similarity index 100%
rename from ndk/platforms/android-L/include/stdint.h
rename to ndk/platforms/android-21/include/stdint.h
diff --git a/ndk/platforms/android-L/include/stdio.h b/ndk/platforms/android-21/include/stdio.h
similarity index 100%
rename from ndk/platforms/android-L/include/stdio.h
rename to ndk/platforms/android-21/include/stdio.h
diff --git a/ndk/platforms/android-L/include/stdlib.h b/ndk/platforms/android-21/include/stdlib.h
similarity index 100%
rename from ndk/platforms/android-L/include/stdlib.h
rename to ndk/platforms/android-21/include/stdlib.h
diff --git a/ndk/platforms/android-L/include/string.h b/ndk/platforms/android-21/include/string.h
similarity index 100%
rename from ndk/platforms/android-L/include/string.h
rename to ndk/platforms/android-21/include/string.h
diff --git a/ndk/platforms/android-L/include/strings.h b/ndk/platforms/android-21/include/strings.h
similarity index 100%
rename from ndk/platforms/android-L/include/strings.h
rename to ndk/platforms/android-21/include/strings.h
diff --git a/ndk/platforms/android-L/include/sys/auxv.h b/ndk/platforms/android-21/include/sys/auxv.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/auxv.h
rename to ndk/platforms/android-21/include/sys/auxv.h
diff --git a/ndk/platforms/android-L/include/sys/cachectl.h b/ndk/platforms/android-21/include/sys/cachectl.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/cachectl.h
rename to ndk/platforms/android-21/include/sys/cachectl.h
diff --git a/ndk/platforms/android-L/include/sys/capability.h b/ndk/platforms/android-21/include/sys/capability.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/capability.h
rename to ndk/platforms/android-21/include/sys/capability.h
diff --git a/ndk/platforms/android-L/include/sys/cdefs.h b/ndk/platforms/android-21/include/sys/cdefs.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/cdefs.h
rename to ndk/platforms/android-21/include/sys/cdefs.h
diff --git a/ndk/platforms/android-L/include/sys/cdefs_elf.h b/ndk/platforms/android-21/include/sys/cdefs_elf.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/cdefs_elf.h
rename to ndk/platforms/android-21/include/sys/cdefs_elf.h
diff --git a/ndk/platforms/android-L/include/sys/endian.h b/ndk/platforms/android-21/include/sys/endian.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/endian.h
rename to ndk/platforms/android-21/include/sys/endian.h
diff --git a/ndk/platforms/android-L/include/sys/epoll.h b/ndk/platforms/android-21/include/sys/epoll.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/epoll.h
rename to ndk/platforms/android-21/include/sys/epoll.h
diff --git a/ndk/platforms/android-L/include/sys/errno.h b/ndk/platforms/android-21/include/sys/errno.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/errno.h
rename to ndk/platforms/android-21/include/sys/errno.h
diff --git a/ndk/platforms/android-L/include/sys/eventfd.h b/ndk/platforms/android-21/include/sys/eventfd.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/eventfd.h
rename to ndk/platforms/android-21/include/sys/eventfd.h
diff --git a/ndk/platforms/android-L/include/sys/file.h b/ndk/platforms/android-21/include/sys/file.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/file.h
rename to ndk/platforms/android-21/include/sys/file.h
diff --git a/ndk/platforms/android-L/include/sys/fsuid.h b/ndk/platforms/android-21/include/sys/fsuid.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/fsuid.h
rename to ndk/platforms/android-21/include/sys/fsuid.h
diff --git a/ndk/platforms/android-L/include/sys/glibc-syscalls.h b/ndk/platforms/android-21/include/sys/glibc-syscalls.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/glibc-syscalls.h
rename to ndk/platforms/android-21/include/sys/glibc-syscalls.h
diff --git a/ndk/platforms/android-L/include/sys/inotify.h b/ndk/platforms/android-21/include/sys/inotify.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/inotify.h
rename to ndk/platforms/android-21/include/sys/inotify.h
diff --git a/ndk/platforms/android-L/include/sys/ioctl.h b/ndk/platforms/android-21/include/sys/ioctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ioctl.h
rename to ndk/platforms/android-21/include/sys/ioctl.h
diff --git a/ndk/platforms/android-L/include/sys/ioctl_compat.h b/ndk/platforms/android-21/include/sys/ioctl_compat.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ioctl_compat.h
rename to ndk/platforms/android-21/include/sys/ioctl_compat.h
diff --git a/ndk/platforms/android-L/include/sys/ipc.h b/ndk/platforms/android-21/include/sys/ipc.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ipc.h
rename to ndk/platforms/android-21/include/sys/ipc.h
diff --git a/ndk/platforms/android-L/include/sys/klog.h b/ndk/platforms/android-21/include/sys/klog.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/klog.h
rename to ndk/platforms/android-21/include/sys/klog.h
diff --git a/ndk/platforms/android-L/include/sys/limits.h b/ndk/platforms/android-21/include/sys/limits.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/limits.h
rename to ndk/platforms/android-21/include/sys/limits.h
diff --git a/ndk/platforms/android-L/include/sys/mman.h b/ndk/platforms/android-21/include/sys/mman.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/mman.h
rename to ndk/platforms/android-21/include/sys/mman.h
diff --git a/ndk/platforms/android-L/include/sys/mount.h b/ndk/platforms/android-21/include/sys/mount.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/mount.h
rename to ndk/platforms/android-21/include/sys/mount.h
diff --git a/ndk/platforms/android-L/include/sys/msg.h b/ndk/platforms/android-21/include/sys/msg.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/msg.h
rename to ndk/platforms/android-21/include/sys/msg.h
diff --git a/ndk/platforms/android-L/include/sys/param.h b/ndk/platforms/android-21/include/sys/param.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/param.h
rename to ndk/platforms/android-21/include/sys/param.h
diff --git a/ndk/platforms/android-L/include/sys/personality.h b/ndk/platforms/android-21/include/sys/personality.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/personality.h
rename to ndk/platforms/android-21/include/sys/personality.h
diff --git a/ndk/platforms/android-L/include/sys/poll.h b/ndk/platforms/android-21/include/sys/poll.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/poll.h
rename to ndk/platforms/android-21/include/sys/poll.h
diff --git a/ndk/platforms/android-L/include/sys/prctl.h b/ndk/platforms/android-21/include/sys/prctl.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/prctl.h
rename to ndk/platforms/android-21/include/sys/prctl.h
diff --git a/ndk/platforms/android-L/include/sys/ptrace.h b/ndk/platforms/android-21/include/sys/ptrace.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ptrace.h
rename to ndk/platforms/android-21/include/sys/ptrace.h
diff --git a/ndk/platforms/android-L/include/sys/queue.h b/ndk/platforms/android-21/include/sys/queue.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/queue.h
rename to ndk/platforms/android-21/include/sys/queue.h
diff --git a/ndk/platforms/android-L/include/sys/reboot.h b/ndk/platforms/android-21/include/sys/reboot.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/reboot.h
rename to ndk/platforms/android-21/include/sys/reboot.h
diff --git a/ndk/platforms/android-L/include/sys/reg.h b/ndk/platforms/android-21/include/sys/reg.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/reg.h
rename to ndk/platforms/android-21/include/sys/reg.h
diff --git a/ndk/platforms/android-L/include/sys/resource.h b/ndk/platforms/android-21/include/sys/resource.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/resource.h
rename to ndk/platforms/android-21/include/sys/resource.h
diff --git a/ndk/platforms/android-L/include/sys/select.h b/ndk/platforms/android-21/include/sys/select.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/select.h
rename to ndk/platforms/android-21/include/sys/select.h
diff --git a/ndk/platforms/android-L/include/sys/sem.h b/ndk/platforms/android-21/include/sys/sem.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/sem.h
rename to ndk/platforms/android-21/include/sys/sem.h
diff --git a/ndk/platforms/android-L/include/sys/sendfile.h b/ndk/platforms/android-21/include/sys/sendfile.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/sendfile.h
rename to ndk/platforms/android-21/include/sys/sendfile.h
diff --git a/ndk/platforms/android-L/include/sys/shm.h b/ndk/platforms/android-21/include/sys/shm.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/shm.h
rename to ndk/platforms/android-21/include/sys/shm.h
diff --git a/ndk/platforms/android-L/include/sys/signal.h b/ndk/platforms/android-21/include/sys/signal.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/signal.h
rename to ndk/platforms/android-21/include/sys/signal.h
diff --git a/ndk/platforms/android-L/include/sys/signalfd.h b/ndk/platforms/android-21/include/sys/signalfd.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/signalfd.h
rename to ndk/platforms/android-21/include/sys/signalfd.h
diff --git a/ndk/platforms/android-L/include/sys/socket.h b/ndk/platforms/android-21/include/sys/socket.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/socket.h
rename to ndk/platforms/android-21/include/sys/socket.h
diff --git a/ndk/platforms/android-L/include/sys/socketcalls.h b/ndk/platforms/android-21/include/sys/socketcalls.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/socketcalls.h
rename to ndk/platforms/android-21/include/sys/socketcalls.h
diff --git a/ndk/platforms/android-L/include/sys/stat.h b/ndk/platforms/android-21/include/sys/stat.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/stat.h
rename to ndk/platforms/android-21/include/sys/stat.h
diff --git a/ndk/platforms/android-L/include/sys/statfs.h b/ndk/platforms/android-21/include/sys/statfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/statfs.h
rename to ndk/platforms/android-21/include/sys/statfs.h
diff --git a/ndk/platforms/android-L/include/sys/statvfs.h b/ndk/platforms/android-21/include/sys/statvfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/statvfs.h
rename to ndk/platforms/android-21/include/sys/statvfs.h
diff --git a/ndk/platforms/android-L/include/sys/swap.h b/ndk/platforms/android-21/include/sys/swap.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/swap.h
rename to ndk/platforms/android-21/include/sys/swap.h
diff --git a/ndk/platforms/android-L/include/sys/syscall.h b/ndk/platforms/android-21/include/sys/syscall.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/syscall.h
rename to ndk/platforms/android-21/include/sys/syscall.h
diff --git a/ndk/platforms/android-L/include/sys/sysconf.h b/ndk/platforms/android-21/include/sys/sysconf.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/sysconf.h
rename to ndk/platforms/android-21/include/sys/sysconf.h
diff --git a/ndk/platforms/android-L/include/sys/sysinfo.h b/ndk/platforms/android-21/include/sys/sysinfo.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/sysinfo.h
rename to ndk/platforms/android-21/include/sys/sysinfo.h
diff --git a/ndk/platforms/android-L/include/sys/syslimits.h b/ndk/platforms/android-21/include/sys/syslimits.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/syslimits.h
rename to ndk/platforms/android-21/include/sys/syslimits.h
diff --git a/ndk/platforms/android-L/include/sys/sysmacros.h b/ndk/platforms/android-21/include/sys/sysmacros.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/sysmacros.h
rename to ndk/platforms/android-21/include/sys/sysmacros.h
diff --git a/ndk/platforms/android-L/include/sys/system_properties.h b/ndk/platforms/android-21/include/sys/system_properties.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/system_properties.h
rename to ndk/platforms/android-21/include/sys/system_properties.h
diff --git a/ndk/platforms/android-L/include/sys/time.h b/ndk/platforms/android-21/include/sys/time.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/time.h
rename to ndk/platforms/android-21/include/sys/time.h
diff --git a/ndk/platforms/android-L/include/sys/timerfd.h b/ndk/platforms/android-21/include/sys/timerfd.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/timerfd.h
rename to ndk/platforms/android-21/include/sys/timerfd.h
diff --git a/ndk/platforms/android-L/include/sys/times.h b/ndk/platforms/android-21/include/sys/times.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/times.h
rename to ndk/platforms/android-21/include/sys/times.h
diff --git a/ndk/platforms/android-L/include/sys/timex.h b/ndk/platforms/android-21/include/sys/timex.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/timex.h
rename to ndk/platforms/android-21/include/sys/timex.h
diff --git a/ndk/platforms/android-L/include/sys/ttychars.h b/ndk/platforms/android-21/include/sys/ttychars.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ttychars.h
rename to ndk/platforms/android-21/include/sys/ttychars.h
diff --git a/ndk/platforms/android-L/include/sys/ttydefaults.h b/ndk/platforms/android-21/include/sys/ttydefaults.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ttydefaults.h
rename to ndk/platforms/android-21/include/sys/ttydefaults.h
diff --git a/ndk/platforms/android-L/include/sys/ttydev.h b/ndk/platforms/android-21/include/sys/ttydev.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ttydev.h
rename to ndk/platforms/android-21/include/sys/ttydev.h
diff --git a/ndk/platforms/android-L/include/sys/types.h b/ndk/platforms/android-21/include/sys/types.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/types.h
rename to ndk/platforms/android-21/include/sys/types.h
diff --git a/ndk/platforms/android-L/include/sys/ucontext.h b/ndk/platforms/android-21/include/sys/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/ucontext.h
rename to ndk/platforms/android-21/include/sys/ucontext.h
diff --git a/ndk/platforms/android-L/include/sys/uio.h b/ndk/platforms/android-21/include/sys/uio.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/uio.h
rename to ndk/platforms/android-21/include/sys/uio.h
diff --git a/ndk/platforms/android-L/include/sys/un.h b/ndk/platforms/android-21/include/sys/un.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/un.h
rename to ndk/platforms/android-21/include/sys/un.h
diff --git a/ndk/platforms/android-L/include/sys/user.h b/ndk/platforms/android-21/include/sys/user.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/user.h
rename to ndk/platforms/android-21/include/sys/user.h
diff --git a/ndk/platforms/android-L/include/sys/utime.h b/ndk/platforms/android-21/include/sys/utime.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/utime.h
rename to ndk/platforms/android-21/include/sys/utime.h
diff --git a/ndk/platforms/android-L/include/sys/utsname.h b/ndk/platforms/android-21/include/sys/utsname.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/utsname.h
rename to ndk/platforms/android-21/include/sys/utsname.h
diff --git a/ndk/platforms/android-L/include/sys/vfs.h b/ndk/platforms/android-21/include/sys/vfs.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/vfs.h
rename to ndk/platforms/android-21/include/sys/vfs.h
diff --git a/ndk/platforms/android-L/include/sys/vt.h b/ndk/platforms/android-21/include/sys/vt.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/vt.h
rename to ndk/platforms/android-21/include/sys/vt.h
diff --git a/ndk/platforms/android-L/include/sys/wait.h b/ndk/platforms/android-21/include/sys/wait.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/wait.h
rename to ndk/platforms/android-21/include/sys/wait.h
diff --git a/ndk/platforms/android-L/include/sys/xattr.h b/ndk/platforms/android-21/include/sys/xattr.h
similarity index 100%
rename from ndk/platforms/android-L/include/sys/xattr.h
rename to ndk/platforms/android-21/include/sys/xattr.h
diff --git a/ndk/platforms/android-L/include/syslog.h b/ndk/platforms/android-21/include/syslog.h
similarity index 100%
rename from ndk/platforms/android-L/include/syslog.h
rename to ndk/platforms/android-21/include/syslog.h
diff --git a/ndk/platforms/android-L/include/termio.h b/ndk/platforms/android-21/include/termio.h
similarity index 100%
rename from ndk/platforms/android-L/include/termio.h
rename to ndk/platforms/android-21/include/termio.h
diff --git a/ndk/platforms/android-L/include/termios.h b/ndk/platforms/android-21/include/termios.h
similarity index 100%
rename from ndk/platforms/android-L/include/termios.h
rename to ndk/platforms/android-21/include/termios.h
diff --git a/ndk/platforms/android-L/include/time.h b/ndk/platforms/android-21/include/time.h
similarity index 100%
rename from ndk/platforms/android-L/include/time.h
rename to ndk/platforms/android-21/include/time.h
diff --git a/ndk/platforms/android-L/include/time64.h b/ndk/platforms/android-21/include/time64.h
similarity index 100%
rename from ndk/platforms/android-L/include/time64.h
rename to ndk/platforms/android-21/include/time64.h
diff --git a/ndk/platforms/android-L/include/uchar.h b/ndk/platforms/android-21/include/uchar.h
similarity index 100%
rename from ndk/platforms/android-L/include/uchar.h
rename to ndk/platforms/android-21/include/uchar.h
diff --git a/ndk/platforms/android-L/include/ucontext.h b/ndk/platforms/android-21/include/ucontext.h
similarity index 100%
rename from ndk/platforms/android-L/include/ucontext.h
rename to ndk/platforms/android-21/include/ucontext.h
diff --git a/ndk/platforms/android-L/include/unistd.h b/ndk/platforms/android-21/include/unistd.h
similarity index 100%
rename from ndk/platforms/android-L/include/unistd.h
rename to ndk/platforms/android-21/include/unistd.h
diff --git a/ndk/platforms/android-L/include/util.h b/ndk/platforms/android-21/include/util.h
similarity index 100%
rename from ndk/platforms/android-L/include/util.h
rename to ndk/platforms/android-21/include/util.h
diff --git a/ndk/platforms/android-L/include/utime.h b/ndk/platforms/android-21/include/utime.h
similarity index 100%
rename from ndk/platforms/android-L/include/utime.h
rename to ndk/platforms/android-21/include/utime.h
diff --git a/ndk/platforms/android-L/include/utmp.h b/ndk/platforms/android-21/include/utmp.h
similarity index 100%
rename from ndk/platforms/android-L/include/utmp.h
rename to ndk/platforms/android-21/include/utmp.h
diff --git a/ndk/platforms/android-L/include/wchar.h b/ndk/platforms/android-21/include/wchar.h
similarity index 100%
rename from ndk/platforms/android-L/include/wchar.h
rename to ndk/platforms/android-21/include/wchar.h
diff --git a/ndk/platforms/android-L/include/wctype.h b/ndk/platforms/android-21/include/wctype.h
similarity index 100%
rename from ndk/platforms/android-L/include/wctype.h
rename to ndk/platforms/android-21/include/wctype.h
diff --git a/ndk/platforms/android-L/include/xlocale.h b/ndk/platforms/android-21/include/xlocale.h
similarity index 100%
rename from ndk/platforms/android-L/include/xlocale.h
rename to ndk/platforms/android-21/include/xlocale.h
diff --git a/ndk/platforms/android-L/samples/native-codec/AndroidManifest.xml b/ndk/platforms/android-21/samples/native-codec/AndroidManifest.xml
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/AndroidManifest.xml
rename to ndk/platforms/android-21/samples/native-codec/AndroidManifest.xml
diff --git a/ndk/platforms/android-L/samples/native-codec/README.txt b/ndk/platforms/android-21/samples/native-codec/README.txt
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/README.txt
rename to ndk/platforms/android-21/samples/native-codec/README.txt
diff --git a/ndk/platforms/android-L/samples/native-codec/default.properties b/ndk/platforms/android-21/samples/native-codec/default.properties
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/default.properties
rename to ndk/platforms/android-21/samples/native-codec/default.properties
diff --git a/ndk/platforms/android-L/samples/native-codec/jni/Android.mk b/ndk/platforms/android-21/samples/native-codec/jni/Android.mk
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/jni/Android.mk
rename to ndk/platforms/android-21/samples/native-codec/jni/Android.mk
diff --git a/ndk/platforms/android-L/samples/native-codec/jni/Application.mk b/ndk/platforms/android-21/samples/native-codec/jni/Application.mk
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/jni/Application.mk
rename to ndk/platforms/android-21/samples/native-codec/jni/Application.mk
diff --git a/ndk/platforms/android-L/samples/native-codec/jni/looper.cpp b/ndk/platforms/android-21/samples/native-codec/jni/looper.cpp
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/jni/looper.cpp
rename to ndk/platforms/android-21/samples/native-codec/jni/looper.cpp
diff --git a/ndk/platforms/android-L/samples/native-codec/jni/looper.h b/ndk/platforms/android-21/samples/native-codec/jni/looper.h
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/jni/looper.h
rename to ndk/platforms/android-21/samples/native-codec/jni/looper.h
diff --git a/ndk/platforms/android-L/samples/native-codec/jni/native-codec-jni.cpp b/ndk/platforms/android-21/samples/native-codec/jni/native-codec-jni.cpp
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/jni/native-codec-jni.cpp
rename to ndk/platforms/android-21/samples/native-codec/jni/native-codec-jni.cpp
diff --git a/ndk/platforms/android-L/samples/native-codec/res/drawable/icon.png b/ndk/platforms/android-21/samples/native-codec/res/drawable/icon.png
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/res/drawable/icon.png
rename to ndk/platforms/android-21/samples/native-codec/res/drawable/icon.png
diff --git a/ndk/platforms/android-L/samples/native-codec/res/layout/main.xml b/ndk/platforms/android-21/samples/native-codec/res/layout/main.xml
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/res/layout/main.xml
rename to ndk/platforms/android-21/samples/native-codec/res/layout/main.xml
diff --git a/ndk/platforms/android-L/samples/native-codec/res/values/strings.xml b/ndk/platforms/android-21/samples/native-codec/res/values/strings.xml
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/res/values/strings.xml
rename to ndk/platforms/android-21/samples/native-codec/res/values/strings.xml
diff --git a/ndk/platforms/android-L/samples/native-codec/src/com/example/nativecodec/MyGLSurfaceView.java b/ndk/platforms/android-21/samples/native-codec/src/com/example/nativecodec/MyGLSurfaceView.java
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/src/com/example/nativecodec/MyGLSurfaceView.java
rename to ndk/platforms/android-21/samples/native-codec/src/com/example/nativecodec/MyGLSurfaceView.java
diff --git a/ndk/platforms/android-L/samples/native-codec/src/com/example/nativecodec/NativeCodec.java b/ndk/platforms/android-21/samples/native-codec/src/com/example/nativecodec/NativeCodec.java
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/src/com/example/nativecodec/NativeCodec.java
rename to ndk/platforms/android-21/samples/native-codec/src/com/example/nativecodec/NativeCodec.java
diff --git a/ndk/platforms/android-L/samples/native-codec/testfile.mp4 b/ndk/platforms/android-21/samples/native-codec/testfile.mp4
similarity index 100%
rename from ndk/platforms/android-L/samples/native-codec/testfile.mp4
rename to ndk/platforms/android-21/samples/native-codec/testfile.mp4
diff --git a/ndk/platforms/android-9/arch-mips/libr6 b/ndk/platforms/android-9/arch-mips/libr6
index f07d413b3..316db77d0 120000
--- a/ndk/platforms/android-9/arch-mips/libr6
+++ b/ndk/platforms/android-9/arch-mips/libr6
@@ -1 +1 @@
-../../android-L/arch-mips64/libr6
\ No newline at end of file
+../../android-21/arch-mips64/libr6
\ No newline at end of file