diff --git a/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_shared.so b/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_shared.so
index 7f9dd06..8a22c60 100755
--- a/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_shared.so
+++ b/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_shared.so
Binary files differ
diff --git a/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_static.a b/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_static.a
index 74dc7d9..f4c44ca 100644
--- a/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_static.a
+++ b/8/sources/cxx-stl/gabi++/libs/mips64/libgabi++_static.a
Binary files differ
diff --git a/8/sources/cxx-stl/stlport/libs/mips64/libstlport_shared.so b/8/sources/cxx-stl/stlport/libs/mips64/libstlport_shared.so
index 9261638..370323a 100755
--- a/8/sources/cxx-stl/stlport/libs/mips64/libstlport_shared.so
+++ b/8/sources/cxx-stl/stlport/libs/mips64/libstlport_shared.so
Binary files differ
diff --git a/8/sources/cxx-stl/stlport/libs/mips64/libstlport_static.a b/8/sources/cxx-stl/stlport/libs/mips64/libstlport_static.a
index b524d5c..a258db5 100644
--- a/8/sources/cxx-stl/stlport/libs/mips64/libstlport_static.a
+++ b/8/sources/cxx-stl/stlport/libs/mips64/libstlport_static.a
Binary files differ
diff --git a/9/platforms/android-12/arch-arm64 b/9/platforms/android-12/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-12/arch-arm64
+++ b/9/platforms/android-12/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-12/arch-mips64 b/9/platforms/android-12/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-12/arch-mips64
+++ b/9/platforms/android-12/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-12/arch-x86_64 b/9/platforms/android-12/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-12/arch-x86_64
+++ b/9/platforms/android-12/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-13/arch-arm64 b/9/platforms/android-13/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-13/arch-arm64
+++ b/9/platforms/android-13/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-13/arch-mips64 b/9/platforms/android-13/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-13/arch-mips64
+++ b/9/platforms/android-13/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-13/arch-x86_64 b/9/platforms/android-13/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-13/arch-x86_64
+++ b/9/platforms/android-13/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-14/arch-arm64 b/9/platforms/android-14/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-14/arch-arm64
+++ b/9/platforms/android-14/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-14/arch-mips64 b/9/platforms/android-14/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-14/arch-mips64
+++ b/9/platforms/android-14/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-14/arch-x86_64 b/9/platforms/android-14/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-14/arch-x86_64
+++ b/9/platforms/android-14/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-15/arch-arm64 b/9/platforms/android-15/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-15/arch-arm64
+++ b/9/platforms/android-15/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-15/arch-mips64 b/9/platforms/android-15/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-15/arch-mips64
+++ b/9/platforms/android-15/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-15/arch-x86_64 b/9/platforms/android-15/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-15/arch-x86_64
+++ b/9/platforms/android-15/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-16/arch-arm64 b/9/platforms/android-16/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-16/arch-arm64
+++ b/9/platforms/android-16/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-16/arch-mips64 b/9/platforms/android-16/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-16/arch-mips64
+++ b/9/platforms/android-16/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-16/arch-x86_64 b/9/platforms/android-16/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-16/arch-x86_64
+++ b/9/platforms/android-16/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-17/arch-arm64 b/9/platforms/android-17/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-17/arch-arm64
+++ b/9/platforms/android-17/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-17/arch-mips64 b/9/platforms/android-17/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-17/arch-mips64
+++ b/9/platforms/android-17/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-17/arch-x86_64 b/9/platforms/android-17/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-17/arch-x86_64
+++ b/9/platforms/android-17/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-18/arch-arm64 b/9/platforms/android-18/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-18/arch-arm64
+++ b/9/platforms/android-18/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-18/arch-mips64 b/9/platforms/android-18/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-18/arch-mips64
+++ b/9/platforms/android-18/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-18/arch-x86_64 b/9/platforms/android-18/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-18/arch-x86_64
+++ b/9/platforms/android-18/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-19/arch-arm64 b/9/platforms/android-19/arch-arm64
new file mode 120000
index 0000000..bfcb6b0
--- /dev/null
+++ b/9/platforms/android-19/arch-arm64
@@ -0,0 +1 @@
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_dynamic.o b/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_dynamic.o
deleted file mode 100644
index 6597ac6..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_dynamic.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_so.o b/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_so.o
deleted file mode 100644
index c14102c..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_so.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_static.o b/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_static.o
deleted file mode 100644
index 6597ac6..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/crtbegin_static.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so b/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so
deleted file mode 100755
index 4b031dc..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/libandroid.so
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libc.so b/9/platforms/android-19/arch-arm64/usr/lib/libc.so
deleted file mode 100755
index 6272b44..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/libc.so
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libmediandk.so b/9/platforms/android-19/arch-arm64/usr/lib/libmediandk.so
deleted file mode 100755
index 762b832..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/libmediandk.so
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libz.a b/9/platforms/android-19/arch-arm64/usr/lib/libz.a
deleted file mode 100644
index 30e0468..0000000
--- a/9/platforms/android-19/arch-arm64/usr/lib/libz.a
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64 b/9/platforms/android-19/arch-mips64
new file mode 120000
index 0000000..6021327
--- /dev/null
+++ b/9/platforms/android-19/arch-mips64
@@ -0,0 +1 @@
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/api-level.h b/9/platforms/android-19/arch-mips64/usr/include/android/api-level.h
deleted file mode 100644
index 9e9c3d6..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/android/api-level.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef ANDROID_API_LEVEL_H
-#define ANDROID_API_LEVEL_H
-
-#define __ANDROID_API__ 19
-
-#endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/input.h b/9/platforms/android-19/arch-mips64/usr/include/linux/input.h
deleted file mode 100644
index df3200c..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/linux/input.h
+++ /dev/null
@@ -1,1045 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _UAPI_INPUT_H
-#define _UAPI_INPUT_H
-#include <sys/time.h>
-#include <sys/ioctl.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#include <sys/types.h>
-#include <linux/types.h>
-struct input_event {
- struct timeval time;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 type;
- __u16 code;
- __s32 value;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_VERSION 0x010001
-struct input_id {
- __u16 bustype;
- __u16 vendor;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 product;
- __u16 version;
-};
-struct input_absinfo {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __s32 value;
- __s32 minimum;
- __s32 maximum;
- __s32 fuzz;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __s32 flat;
- __s32 resolution;
-};
-struct input_keymap_entry {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define INPUT_KEYMAP_BY_INDEX (1 << 0)
- __u8 flags;
- __u8 len;
- __u16 index;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u32 keycode;
- __u8 scancode[32];
-};
-#define EVIOCGVERSION _IOR('E', 0x01, int)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGID _IOR('E', 0x02, struct input_id)
-#define EVIOCGREP _IOR('E', 0x03, unsigned int[2])
-#define EVIOCSREP _IOW('E', 0x03, unsigned int[2])
-#define EVIOCGKEYCODE _IOR('E', 0x04, unsigned int[2])
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry)
-#define EVIOCSKEYCODE _IOW('E', 0x04, unsigned int[2])
-#define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry)
-#define EVIOCGNAME(len) _IOC(_IOC_READ, 'E', 0x06, len)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGPHYS(len) _IOC(_IOC_READ, 'E', 0x07, len)
-#define EVIOCGUNIQ(len) _IOC(_IOC_READ, 'E', 0x08, len)
-#define EVIOCGPROP(len) _IOC(_IOC_READ, 'E', 0x09, len)
-#define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len)
-#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len)
-#define EVIOCGSND(len) _IOC(_IOC_READ, 'E', 0x1a, len)
-#define EVIOCGSW(len) _IOC(_IOC_READ, 'E', 0x1b, len)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGBIT(ev,len) _IOC(_IOC_READ, 'E', 0x20 + (ev), len)
-#define EVIOCGABS(abs) _IOR('E', 0x40 + (abs), struct input_absinfo)
-#define EVIOCSABS(abs) _IOW('E', 0xc0 + (abs), struct input_absinfo)
-#define EVIOCSFF _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCRMFF _IOW('E', 0x81, int)
-#define EVIOCGEFFECTS _IOR('E', 0x84, int)
-#define EVIOCGRAB _IOW('E', 0x90, int)
-#define EVIOCREVOKE _IOW('E', 0x91, int)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCSCLOCKID _IOW('E', 0xa0, int)
-#define INPUT_PROP_POINTER 0x00
-#define INPUT_PROP_DIRECT 0x01
-#define INPUT_PROP_BUTTONPAD 0x02
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define INPUT_PROP_SEMI_MT 0x03
-#define INPUT_PROP_MAX 0x1f
-#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_KEY 0x01
-#define EV_REL 0x02
-#define EV_ABS 0x03
-#define EV_MSC 0x04
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_SW 0x05
-#define EV_LED 0x11
-#define EV_SND 0x12
-#define EV_REP 0x14
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_FF 0x15
-#define EV_PWR 0x16
-#define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_CNT (EV_MAX+1)
-#define SYN_REPORT 0
-#define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SYN_DROPPED 3
-#define SYN_MAX 0xf
-#define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_ESC 1
-#define KEY_1 2
-#define KEY_2 3
-#define KEY_3 4
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_4 5
-#define KEY_5 6
-#define KEY_6 7
-#define KEY_7 8
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_8 9
-#define KEY_9 10
-#define KEY_0 11
-#define KEY_MINUS 12
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_EQUAL 13
-#define KEY_BACKSPACE 14
-#define KEY_TAB 15
-#define KEY_Q 16
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_W 17
-#define KEY_E 18
-#define KEY_R 19
-#define KEY_T 20
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_Y 21
-#define KEY_U 22
-#define KEY_I 23
-#define KEY_O 24
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_P 25
-#define KEY_LEFTBRACE 26
-#define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_LEFTCTRL 29
-#define KEY_A 30
-#define KEY_S 31
-#define KEY_D 32
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F 33
-#define KEY_G 34
-#define KEY_H 35
-#define KEY_J 36
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_K 37
-#define KEY_L 38
-#define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_GRAVE 41
-#define KEY_LEFTSHIFT 42
-#define KEY_BACKSLASH 43
-#define KEY_Z 44
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_X 45
-#define KEY_C 46
-#define KEY_V 47
-#define KEY_B 48
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_N 49
-#define KEY_M 50
-#define KEY_COMMA 51
-#define KEY_DOT 52
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SLASH 53
-#define KEY_RIGHTSHIFT 54
-#define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SPACE 57
-#define KEY_CAPSLOCK 58
-#define KEY_F1 59
-#define KEY_F2 60
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F3 61
-#define KEY_F4 62
-#define KEY_F5 63
-#define KEY_F6 64
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F7 65
-#define KEY_F8 66
-#define KEY_F9 67
-#define KEY_F10 68
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMLOCK 69
-#define KEY_SCROLLLOCK 70
-#define KEY_KP7 71
-#define KEY_KP8 72
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KP9 73
-#define KEY_KPMINUS 74
-#define KEY_KP4 75
-#define KEY_KP5 76
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KP6 77
-#define KEY_KPPLUS 78
-#define KEY_KP1 79
-#define KEY_KP2 80
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KP3 81
-#define KEY_KP0 82
-#define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_102ND 86
-#define KEY_F11 87
-#define KEY_F12 88
-#define KEY_RO 89
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KATAKANA 90
-#define KEY_HIRAGANA 91
-#define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_MUHENKAN 94
-#define KEY_KPJPCOMMA 95
-#define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KPSLASH 98
-#define KEY_SYSRQ 99
-#define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_HOME 102
-#define KEY_UP 103
-#define KEY_PAGEUP 104
-#define KEY_LEFT 105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_RIGHT 106
-#define KEY_END 107
-#define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_INSERT 110
-#define KEY_DELETE 111
-#define KEY_MACRO 112
-#define KEY_MUTE 113
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_VOLUMEDOWN 114
-#define KEY_VOLUMEUP 115
-#define KEY_POWER 116
-#define KEY_KPEQUAL 117
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KPPLUSMINUS 118
-#define KEY_PAUSE 119
-#define KEY_SCALE 120
-#define KEY_KPCOMMA 121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_HANGEUL 122
-#define KEY_HANGUEL KEY_HANGEUL
-#define KEY_HANJA 123
-#define KEY_YEN 124
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_LEFTMETA 125
-#define KEY_RIGHTMETA 126
-#define KEY_COMPOSE 127
-#define KEY_STOP 128
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_AGAIN 129
-#define KEY_PROPS 130
-#define KEY_UNDO 131
-#define KEY_FRONT 132
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_COPY 133
-#define KEY_OPEN 134
-#define KEY_PASTE 135
-#define KEY_FIND 136
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CUT 137
-#define KEY_HELP 138
-#define KEY_MENU 139
-#define KEY_CALC 140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SETUP 141
-#define KEY_SLEEP 142
-#define KEY_WAKEUP 143
-#define KEY_FILE 144
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SENDFILE 145
-#define KEY_DELETEFILE 146
-#define KEY_XFER 147
-#define KEY_PROG1 148
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PROG2 149
-#define KEY_WWW 150
-#define KEY_MSDOS 151
-#define KEY_COFFEE 152
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SCREENLOCK KEY_COFFEE
-#define KEY_DIRECTION 153
-#define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BOOKMARKS 156
-#define KEY_COMPUTER 157
-#define KEY_BACK 158
-#define KEY_FORWARD 159
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CLOSECD 160
-#define KEY_EJECTCD 161
-#define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PLAYPAUSE 164
-#define KEY_PREVIOUSSONG 165
-#define KEY_STOPCD 166
-#define KEY_RECORD 167
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_REWIND 168
-#define KEY_PHONE 169
-#define KEY_ISO 170
-#define KEY_CONFIG 171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_HOMEPAGE 172
-#define KEY_REFRESH 173
-#define KEY_EXIT 174
-#define KEY_MOVE 175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_EDIT 176
-#define KEY_SCROLLUP 177
-#define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KPRIGHTPAREN 180
-#define KEY_NEW 181
-#define KEY_REDO 182
-#define KEY_F13 183
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F14 184
-#define KEY_F15 185
-#define KEY_F16 186
-#define KEY_F17 187
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F18 188
-#define KEY_F19 189
-#define KEY_F20 190
-#define KEY_F21 191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F22 192
-#define KEY_F23 193
-#define KEY_F24 194
-#define KEY_PLAYCD 200
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PAUSECD 201
-#define KEY_PROG3 202
-#define KEY_PROG4 203
-#define KEY_DASHBOARD 204
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SUSPEND 205
-#define KEY_CLOSE 206
-#define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BASSBOOST 209
-#define KEY_PRINT 210
-#define KEY_HP 211
-#define KEY_CAMERA 212
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SOUND 213
-#define KEY_QUESTION 214
-#define KEY_EMAIL 215
-#define KEY_CHAT 216
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SEARCH 217
-#define KEY_CONNECT 218
-#define KEY_FINANCE 219
-#define KEY_SPORT 220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SHOP 221
-#define KEY_ALTERASE 222
-#define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BRIGHTNESSUP 225
-#define KEY_MEDIA 226
-#define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KBDILLUMDOWN 229
-#define KEY_KBDILLUMUP 230
-#define KEY_SEND 231
-#define KEY_REPLY 232
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FORWARDMAIL 233
-#define KEY_SAVE 234
-#define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BLUETOOTH 237
-#define KEY_WLAN 238
-#define KEY_UWB 239
-#define KEY_UNKNOWN 240
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_VIDEO_NEXT 241
-#define KEY_VIDEO_PREV 242
-#define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DISPLAY_OFF 245
-#define KEY_WWAN 246
-#define KEY_WIMAX KEY_WWAN
-#define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_MICMUTE 248
-#define BTN_MISC 0x100
-#define BTN_0 0x100
-#define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_2 0x102
-#define BTN_3 0x103
-#define BTN_4 0x104
-#define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_6 0x106
-#define BTN_7 0x107
-#define BTN_8 0x108
-#define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_MOUSE 0x110
-#define BTN_LEFT 0x110
-#define BTN_RIGHT 0x111
-#define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_SIDE 0x113
-#define BTN_EXTRA 0x114
-#define BTN_FORWARD 0x115
-#define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TASK 0x117
-#define BTN_JOYSTICK 0x120
-#define BTN_TRIGGER 0x120
-#define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_THUMB2 0x122
-#define BTN_TOP 0x123
-#define BTN_TOP2 0x124
-#define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_BASE 0x126
-#define BTN_BASE2 0x127
-#define BTN_BASE3 0x128
-#define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_BASE5 0x12a
-#define BTN_BASE6 0x12b
-#define BTN_DEAD 0x12f
-#define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_SOUTH 0x130
-#define BTN_A BTN_SOUTH
-#define BTN_EAST 0x131
-#define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_C 0x132
-#define BTN_NORTH 0x133
-#define BTN_X BTN_NORTH
-#define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_Y BTN_WEST
-#define BTN_Z 0x135
-#define BTN_TL 0x136
-#define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TL2 0x138
-#define BTN_TR2 0x139
-#define BTN_SELECT 0x13a
-#define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_MODE 0x13c
-#define BTN_THUMBL 0x13d
-#define BTN_THUMBR 0x13e
-#define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_PEN 0x140
-#define BTN_TOOL_RUBBER 0x141
-#define BTN_TOOL_BRUSH 0x142
-#define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_AIRBRUSH 0x144
-#define BTN_TOOL_FINGER 0x145
-#define BTN_TOOL_MOUSE 0x146
-#define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_QUINTTAP 0x148
-#define BTN_TOUCH 0x14a
-#define BTN_STYLUS 0x14b
-#define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_DOUBLETAP 0x14d
-#define BTN_TOOL_TRIPLETAP 0x14e
-#define BTN_TOOL_QUADTAP 0x14f
-#define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_GEAR_DOWN 0x150
-#define BTN_GEAR_UP 0x151
-#define KEY_OK 0x160
-#define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_GOTO 0x162
-#define KEY_CLEAR 0x163
-#define KEY_POWER2 0x164
-#define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_INFO 0x166
-#define KEY_TIME 0x167
-#define KEY_VENDOR 0x168
-#define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PROGRAM 0x16a
-#define KEY_CHANNEL 0x16b
-#define KEY_FAVORITES 0x16c
-#define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PVR 0x16e
-#define KEY_MHP 0x16f
-#define KEY_LANGUAGE 0x170
-#define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SUBTITLE 0x172
-#define KEY_ANGLE 0x173
-#define KEY_ZOOM 0x174
-#define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KEYBOARD 0x176
-#define KEY_SCREEN 0x177
-#define KEY_PC 0x178
-#define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TV2 0x17a
-#define KEY_VCR 0x17b
-#define KEY_VCR2 0x17c
-#define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SAT2 0x17e
-#define KEY_CD 0x17f
-#define KEY_TAPE 0x180
-#define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TUNER 0x182
-#define KEY_PLAYER 0x183
-#define KEY_TEXT 0x184
-#define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_AUX 0x186
-#define KEY_MP3 0x187
-#define KEY_AUDIO 0x188
-#define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DIRECTORY 0x18a
-#define KEY_LIST 0x18b
-#define KEY_MEMO 0x18c
-#define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_RED 0x18e
-#define KEY_GREEN 0x18f
-#define KEY_YELLOW 0x190
-#define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CHANNELUP 0x192
-#define KEY_CHANNELDOWN 0x193
-#define KEY_FIRST 0x194
-#define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_AB 0x196
-#define KEY_NEXT 0x197
-#define KEY_RESTART 0x198
-#define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SHUFFLE 0x19a
-#define KEY_BREAK 0x19b
-#define KEY_PREVIOUS 0x19c
-#define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TEEN 0x19e
-#define KEY_TWEN 0x19f
-#define KEY_VIDEOPHONE 0x1a0
-#define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_ZOOMIN 0x1a2
-#define KEY_ZOOMOUT 0x1a3
-#define KEY_ZOOMRESET 0x1a4
-#define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_EDITOR 0x1a6
-#define KEY_SPREADSHEET 0x1a7
-#define KEY_GRAPHICSEDITOR 0x1a8
-#define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DATABASE 0x1aa
-#define KEY_NEWS 0x1ab
-#define KEY_VOICEMAIL 0x1ac
-#define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_MESSENGER 0x1ae
-#define KEY_DISPLAYTOGGLE 0x1af
-#define KEY_SPELLCHECK 0x1b0
-#define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DOLLAR 0x1b2
-#define KEY_EURO 0x1b3
-#define KEY_FRAMEBACK 0x1b4
-#define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CONTEXT_MENU 0x1b6
-#define KEY_MEDIA_REPEAT 0x1b7
-#define KEY_10CHANNELSUP 0x1b8
-#define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_IMAGES 0x1ba
-#define KEY_DEL_EOL 0x1c0
-#define KEY_DEL_EOS 0x1c1
-#define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DEL_LINE 0x1c3
-#define KEY_FN 0x1d0
-#define KEY_FN_ESC 0x1d1
-#define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_F2 0x1d3
-#define KEY_FN_F3 0x1d4
-#define KEY_FN_F4 0x1d5
-#define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_F6 0x1d7
-#define KEY_FN_F7 0x1d8
-#define KEY_FN_F8 0x1d9
-#define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_F10 0x1db
-#define KEY_FN_F11 0x1dc
-#define KEY_FN_F12 0x1dd
-#define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_2 0x1df
-#define KEY_FN_D 0x1e0
-#define KEY_FN_E 0x1e1
-#define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_S 0x1e3
-#define KEY_FN_B 0x1e4
-#define KEY_BRL_DOT1 0x1f1
-#define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BRL_DOT3 0x1f3
-#define KEY_BRL_DOT4 0x1f4
-#define KEY_BRL_DOT5 0x1f5
-#define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BRL_DOT7 0x1f7
-#define KEY_BRL_DOT8 0x1f8
-#define KEY_BRL_DOT9 0x1f9
-#define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMERIC_0 0x200
-#define KEY_NUMERIC_1 0x201
-#define KEY_NUMERIC_2 0x202
-#define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMERIC_4 0x204
-#define KEY_NUMERIC_5 0x205
-#define KEY_NUMERIC_6 0x206
-#define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMERIC_8 0x208
-#define KEY_NUMERIC_9 0x209
-#define KEY_NUMERIC_STAR 0x20a
-#define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CAMERA_FOCUS 0x210
-#define KEY_WPS_BUTTON 0x211
-#define KEY_TOUCHPAD_TOGGLE 0x212
-#define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TOUCHPAD_OFF 0x214
-#define KEY_CAMERA_ZOOMIN 0x215
-#define KEY_CAMERA_ZOOMOUT 0x216
-#define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CAMERA_DOWN 0x218
-#define KEY_CAMERA_LEFT 0x219
-#define KEY_CAMERA_RIGHT 0x21a
-#define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_ATTENDANT_OFF 0x21c
-#define KEY_ATTENDANT_TOGGLE 0x21d
-#define KEY_LIGHTS_TOGGLE 0x21e
-#define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_DPAD_DOWN 0x221
-#define BTN_DPAD_LEFT 0x222
-#define BTN_DPAD_RIGHT 0x223
-#define KEY_ALS_TOGGLE 0x230
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY 0x2c0
-#define BTN_TRIGGER_HAPPY1 0x2c0
-#define BTN_TRIGGER_HAPPY2 0x2c1
-#define BTN_TRIGGER_HAPPY3 0x2c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY4 0x2c3
-#define BTN_TRIGGER_HAPPY5 0x2c4
-#define BTN_TRIGGER_HAPPY6 0x2c5
-#define BTN_TRIGGER_HAPPY7 0x2c6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY8 0x2c7
-#define BTN_TRIGGER_HAPPY9 0x2c8
-#define BTN_TRIGGER_HAPPY10 0x2c9
-#define BTN_TRIGGER_HAPPY11 0x2ca
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY12 0x2cb
-#define BTN_TRIGGER_HAPPY13 0x2cc
-#define BTN_TRIGGER_HAPPY14 0x2cd
-#define BTN_TRIGGER_HAPPY15 0x2ce
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY16 0x2cf
-#define BTN_TRIGGER_HAPPY17 0x2d0
-#define BTN_TRIGGER_HAPPY18 0x2d1
-#define BTN_TRIGGER_HAPPY19 0x2d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY20 0x2d3
-#define BTN_TRIGGER_HAPPY21 0x2d4
-#define BTN_TRIGGER_HAPPY22 0x2d5
-#define BTN_TRIGGER_HAPPY23 0x2d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY24 0x2d7
-#define BTN_TRIGGER_HAPPY25 0x2d8
-#define BTN_TRIGGER_HAPPY26 0x2d9
-#define BTN_TRIGGER_HAPPY27 0x2da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY28 0x2db
-#define BTN_TRIGGER_HAPPY29 0x2dc
-#define BTN_TRIGGER_HAPPY30 0x2dd
-#define BTN_TRIGGER_HAPPY31 0x2de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY32 0x2df
-#define BTN_TRIGGER_HAPPY33 0x2e0
-#define BTN_TRIGGER_HAPPY34 0x2e1
-#define BTN_TRIGGER_HAPPY35 0x2e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY36 0x2e3
-#define BTN_TRIGGER_HAPPY37 0x2e4
-#define BTN_TRIGGER_HAPPY38 0x2e5
-#define BTN_TRIGGER_HAPPY39 0x2e6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY40 0x2e7
-#define KEY_MIN_INTERESTING KEY_MUTE
-#define KEY_MAX 0x2ff
-#define KEY_CNT (KEY_MAX+1)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REL_X 0x00
-#define REL_Y 0x01
-#define REL_Z 0x02
-#define REL_RX 0x03
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REL_RY 0x04
-#define REL_RZ 0x05
-#define REL_HWHEEL 0x06
-#define REL_DIAL 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REL_WHEEL 0x08
-#define REL_MISC 0x09
-#define REL_MAX 0x0f
-#define REL_CNT (REL_MAX+1)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_X 0x00
-#define ABS_Y 0x01
-#define ABS_Z 0x02
-#define ABS_RX 0x03
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_RY 0x04
-#define ABS_RZ 0x05
-#define ABS_THROTTLE 0x06
-#define ABS_RUDDER 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_WHEEL 0x08
-#define ABS_GAS 0x09
-#define ABS_BRAKE 0x0a
-#define ABS_HAT0X 0x10
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_HAT0Y 0x11
-#define ABS_HAT1X 0x12
-#define ABS_HAT1Y 0x13
-#define ABS_HAT2X 0x14
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_HAT2Y 0x15
-#define ABS_HAT3X 0x16
-#define ABS_HAT3Y 0x17
-#define ABS_PRESSURE 0x18
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_DISTANCE 0x19
-#define ABS_TILT_X 0x1a
-#define ABS_TILT_Y 0x1b
-#define ABS_TOOL_WIDTH 0x1c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_VOLUME 0x20
-#define ABS_MISC 0x28
-#define ABS_MT_SLOT 0x2f
-#define ABS_MT_TOUCH_MAJOR 0x30
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_TOUCH_MINOR 0x31
-#define ABS_MT_WIDTH_MAJOR 0x32
-#define ABS_MT_WIDTH_MINOR 0x33
-#define ABS_MT_ORIENTATION 0x34
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_POSITION_X 0x35
-#define ABS_MT_POSITION_Y 0x36
-#define ABS_MT_TOOL_TYPE 0x37
-#define ABS_MT_BLOB_ID 0x38
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_TRACKING_ID 0x39
-#define ABS_MT_PRESSURE 0x3a
-#define ABS_MT_DISTANCE 0x3b
-#define ABS_MT_TOOL_X 0x3c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_TOOL_Y 0x3d
-#define ABS_MAX 0x3f
-#define ABS_CNT (ABS_MAX+1)
-#define SW_LID 0x00
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_TABLET_MODE 0x01
-#define SW_HEADPHONE_INSERT 0x02
-#define SW_RFKILL_ALL 0x03
-#define SW_RADIO SW_RFKILL_ALL
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_MICROPHONE_INSERT 0x04
-#define SW_DOCK 0x05
-#define SW_LINEOUT_INSERT 0x06
-#define SW_JACK_PHYSICAL_INSERT 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_VIDEOOUT_INSERT 0x08
-#define SW_CAMERA_LENS_COVER 0x09
-#define SW_KEYPAD_SLIDE 0x0a
-#define SW_FRONT_PROXIMITY 0x0b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_ROTATE_LOCK 0x0c
-#define SW_LINEIN_INSERT 0x0d
-#define SW_MUTE_DEVICE 0x0e
-#define SW_MAX 0x0f
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_CNT (SW_MAX+1)
-#define MSC_SERIAL 0x00
-#define MSC_PULSELED 0x01
-#define MSC_GESTURE 0x02
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSC_RAW 0x03
-#define MSC_SCAN 0x04
-#define MSC_TIMESTAMP 0x05
-#define MSC_MAX 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSC_CNT (MSC_MAX+1)
-#define LED_NUML 0x00
-#define LED_CAPSL 0x01
-#define LED_SCROLLL 0x02
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define LED_COMPOSE 0x03
-#define LED_KANA 0x04
-#define LED_SLEEP 0x05
-#define LED_SUSPEND 0x06
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define LED_MUTE 0x07
-#define LED_MISC 0x08
-#define LED_MAIL 0x09
-#define LED_CHARGING 0x0a
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define LED_MAX 0x0f
-#define LED_CNT (LED_MAX+1)
-#define REP_DELAY 0x00
-#define REP_PERIOD 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REP_MAX 0x01
-#define REP_CNT (REP_MAX+1)
-#define SND_CLICK 0x00
-#define SND_BELL 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SND_TONE 0x02
-#define SND_MAX 0x07
-#define SND_CNT (SND_MAX+1)
-#define ID_BUS 0
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ID_VENDOR 1
-#define ID_PRODUCT 2
-#define ID_VERSION 3
-#define BUS_PCI 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_ISAPNP 0x02
-#define BUS_USB 0x03
-#define BUS_HIL 0x04
-#define BUS_BLUETOOTH 0x05
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_VIRTUAL 0x06
-#define BUS_ISA 0x10
-#define BUS_I8042 0x11
-#define BUS_XTKBD 0x12
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_RS232 0x13
-#define BUS_GAMEPORT 0x14
-#define BUS_PARPORT 0x15
-#define BUS_AMIGA 0x16
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_ADB 0x17
-#define BUS_I2C 0x18
-#define BUS_HOST 0x19
-#define BUS_GSC 0x1A
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_ATARI 0x1B
-#define BUS_SPI 0x1C
-#define MT_TOOL_FINGER 0
-#define MT_TOOL_PEN 1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MT_TOOL_MAX 1
-#define FF_STATUS_STOPPED 0x00
-#define FF_STATUS_PLAYING 0x01
-#define FF_STATUS_MAX 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct ff_replay {
- __u16 length;
- __u16 delay;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct ff_trigger {
- __u16 button;
- __u16 interval;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct ff_envelope {
- __u16 attack_length;
- __u16 attack_level;
- __u16 fade_length;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 fade_level;
-};
-struct ff_constant_effect {
- __s16 level;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ff_envelope envelope;
-};
-struct ff_ramp_effect {
- __s16 start_level;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __s16 end_level;
- struct ff_envelope envelope;
-};
-struct ff_condition_effect {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 right_saturation;
- __u16 left_saturation;
- __s16 right_coeff;
- __s16 left_coeff;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 deadband;
- __s16 center;
-};
-struct ff_periodic_effect {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 waveform;
- __u16 period;
- __s16 magnitude;
- __s16 offset;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 phase;
- struct ff_envelope envelope;
- __u32 custom_len;
- __s16 __user *custom_data;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct ff_rumble_effect {
- __u16 strong_magnitude;
- __u16 weak_magnitude;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct ff_effect {
- __u16 type;
- __s16 id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 direction;
- struct ff_trigger trigger;
- struct ff_replay replay;
- union {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ff_constant_effect constant;
- struct ff_ramp_effect ramp;
- struct ff_periodic_effect periodic;
- struct ff_condition_effect condition[2];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ff_rumble_effect rumble;
- } u;
-};
-#define FF_RUMBLE 0x50
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_PERIODIC 0x51
-#define FF_CONSTANT 0x52
-#define FF_SPRING 0x53
-#define FF_FRICTION 0x54
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_DAMPER 0x55
-#define FF_INERTIA 0x56
-#define FF_RAMP 0x57
-#define FF_EFFECT_MIN FF_RUMBLE
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_EFFECT_MAX FF_RAMP
-#define FF_SQUARE 0x58
-#define FF_TRIANGLE 0x59
-#define FF_SINE 0x5a
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_SAW_UP 0x5b
-#define FF_SAW_DOWN 0x5c
-#define FF_CUSTOM 0x5d
-#define FF_WAVEFORM_MIN FF_SQUARE
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_WAVEFORM_MAX FF_CUSTOM
-#define FF_GAIN 0x60
-#define FF_AUTOCENTER 0x61
-#define FF_MAX 0x7f
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_CNT (FF_MAX+1)
-#endif
diff --git a/9/platforms/android-19/arch-mips64/usr/include/malloc.h b/9/platforms/android-19/arch-mips64/usr/include/malloc.h
deleted file mode 100644
index 1e92b7d..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/malloc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIBC_INCLUDE_MALLOC_H_
-#define LIBC_INCLUDE_MALLOC_H_
-
-/*
- * Declaration of malloc routines. Bionic uses dlmalloc (see
- * upstream-dlmalloc) but doesn't directly include it here to keep the
- * defined malloc.h interface small.
- */
-#include <sys/cdefs.h>
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
-extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
-extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
-extern void free(void* p);
-extern size_t malloc_usable_size(const void* p);
-
-#ifndef STRUCT_MALLINFO_DECLARED
-#define STRUCT_MALLINFO_DECLARED 1
-struct mallinfo {
-  size_t arena;    /* Total number of non-mmapped bytes currently allocated from OS. */
-  size_t ordblks;  /* Number of free chunks. */
-  size_t smblks;   /* (Unused.) */
-  size_t hblks;    /* (Unused.) */
-  size_t hblkhd;   /* Total number of bytes in mmapped regions. */
-  size_t usmblks;  /* Maximum total allocated space; greater than total if trimming has occurred. */
-  size_t fsmblks;  /* (Unused.) */
-  size_t uordblks; /* Total allocated space (normal or mmapped.) */
-  size_t fordblks; /* Total free space. */
-  size_t keepcost; /* Upper bound on number of bytes releasable by malloc_trim. */
-};
-#endif  /* STRUCT_MALLINFO_DECLARED */
-
-extern struct mallinfo mallinfo(void);
-
-__END_DECLS
-
-#endif  /* LIBC_INCLUDE_MALLOC_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/math.h b/9/platforms/android-19/arch-mips64/usr/include/math.h
deleted file mode 100644
index 8369d6e..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/math.h
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/*
- * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
- */
-
-#ifndef _MATH_H_
-#define	_MATH_H_
-
-#include <sys/cdefs.h>
-#include <limits.h>
-
-__BEGIN_DECLS
-#pragma GCC visibility push(default)
-
-/*
- * ANSI/POSIX
- */
-extern const union __infinity_un {
-	unsigned char	__uc[8];
-	double		__ud;
-} __infinity;
-
-extern const union __nan_un {
-	unsigned char	__uc[sizeof(float)];
-	float		__uf;
-} __nan;
-
-#if __GNUC_PREREQ(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
-#define	__MATH_BUILTIN_CONSTANTS
-#endif
-
-#if __GNUC_PREREQ(3, 0) && !defined(__INTEL_COMPILER)
-#define	__MATH_BUILTIN_RELOPS
-#endif
-
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VAL	__builtin_huge_val()
-#else
-#define	HUGE_VAL	(__infinity.__ud)
-#endif
-
-#if __ISO_C_VISIBLE >= 1999
-#define	FP_ILOGB0	(-INT_MAX) /* Android-changed */
-#define	FP_ILOGBNAN	INT_MAX /* Android-changed */
-
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VALF	__builtin_huge_valf()
-#define	HUGE_VALL	__builtin_huge_vall()
-#define	INFINITY	__builtin_inff()
-#define	NAN		__builtin_nanf("")
-#else
-#define	HUGE_VALF	(float)HUGE_VAL
-#define	HUGE_VALL	(long double)HUGE_VAL
-#define	INFINITY	HUGE_VALF
-#define	NAN		(__nan.__uf)
-#endif /* __MATH_BUILTIN_CONSTANTS */
-
-#define	MATH_ERRNO	1
-#define	MATH_ERREXCEPT	2
-#define	math_errhandling	MATH_ERREXCEPT
-
-#define	FP_FAST_FMAF	1
-#ifdef __ia64__
-#define	FP_FAST_FMA	1
-#define	FP_FAST_FMAL	1
-#endif
-
-/* Symbolic constants to classify floating point numbers. */
-#define	FP_INFINITE	0x01
-#define	FP_NAN		0x02
-#define	FP_NORMAL	0x04
-#define	FP_SUBNORMAL	0x08
-#define	FP_ZERO		0x10
-#define	fpclassify(x) \
-    ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \
-    : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \
-    : __fpclassifyl(x))
-
-#define	isfinite(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isfinite(x)	\
-    : __isfinitel(x))
-#define	isinf(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isinff(x)	\
-    : (sizeof (x) == sizeof (double)) ? isinf(x)	\
-    : __isinfl(x))
-#define	isnan(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isnanf(x)	\
-    : (sizeof (x) == sizeof (double)) ? isnan(x)	\
-    : __isnanl(x))
-#define	isnormal(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isnormalf(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isnormal(x)	\
-    : __isnormall(x))
-
-#ifdef __MATH_BUILTIN_RELOPS
-#define	isgreater(x, y)		__builtin_isgreater((x), (y))
-#define	isgreaterequal(x, y)	__builtin_isgreaterequal((x), (y))
-#define	isless(x, y)		__builtin_isless((x), (y))
-#define	islessequal(x, y)	__builtin_islessequal((x), (y))
-#define	islessgreater(x, y)	__builtin_islessgreater((x), (y))
-#define	isunordered(x, y)	__builtin_isunordered((x), (y))
-#else
-#define	isgreater(x, y)		(!isunordered((x), (y)) && (x) > (y))
-#define	isgreaterequal(x, y)	(!isunordered((x), (y)) && (x) >= (y))
-#define	isless(x, y)		(!isunordered((x), (y)) && (x) < (y))
-#define	islessequal(x, y)	(!isunordered((x), (y)) && (x) <= (y))
-#define	islessgreater(x, y)	(!isunordered((x), (y)) && \
-					((x) > (y) || (y) > (x)))
-#define	isunordered(x, y)	(isnan(x) || isnan(y))
-#endif /* __MATH_BUILTIN_RELOPS */
-
-#define	signbit(x)					\
-    ((sizeof (x) == sizeof (float)) ? __signbitf(x)	\
-    : (sizeof (x) == sizeof (double)) ? __signbit(x)	\
-    : __signbitl(x))
-
-typedef double __double_t;
-typedef __double_t double_t;
-typedef float __float_t;
-typedef __float_t float_t;
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-/*
- * XOPEN/SVID
- */
-#if __BSD_VISIBLE || __XSI_VISIBLE
-#define	M_E		2.7182818284590452354	/* e */
-#define	M_LOG2E		1.4426950408889634074	/* log 2e */
-#define	M_LOG10E	0.43429448190325182765	/* log 10e */
-#define	M_LN2		0.69314718055994530942	/* log e2 */
-#define	M_LN10		2.30258509299404568402	/* log e10 */
-#define	M_PI		3.14159265358979323846	/* pi */
-#define	M_PI_2		1.57079632679489661923	/* pi/2 */
-#define	M_PI_4		0.78539816339744830962	/* pi/4 */
-#define	M_1_PI		0.31830988618379067154	/* 1/pi */
-#define	M_2_PI		0.63661977236758134308	/* 2/pi */
-#define	M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
-#define	M_SQRT2		1.41421356237309504880	/* sqrt(2) */
-#define	M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
-
-#define	MAXFLOAT	((float)3.40282346638528860e+38)
-extern int signgam;
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE
-#if 0
-/* Old value from 4.4BSD-Lite math.h; this is probably better. */
-#define	HUGE		HUGE_VAL
-#else
-#define	HUGE		MAXFLOAT
-#endif
-#endif /* __BSD_VISIBLE */
-
-/*
- * Most of these functions depend on the rounding mode and have the side
- * effect of raising floating-point exceptions, so they are not declared
- * as __pure2.  In C99, FENV_ACCESS affects the purity of these functions.
- */
-
-/*
- * ANSI/POSIX
- */
-int	__fpclassifyd(double) __NDK_FPABI_MATH__  __pure2;
-int	__fpclassifyf(float) __NDK_FPABI_MATH__  __pure2;
-int	__fpclassifyl(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isfinitef(float) __NDK_FPABI_MATH__  __pure2;
-int	__isfinite(double) __NDK_FPABI_MATH__  __pure2;
-int	__isfinitel(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isinff(float) __NDK_FPABI_MATH__  __pure2;
-int	__isinfl(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isnanf(float) __NDK_FPABI_MATH__  __pure2;
-int	__isnanl(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isnormalf(float) __NDK_FPABI_MATH__  __pure2;
-int	__isnormal(double) __NDK_FPABI_MATH__  __pure2;
-int	__isnormall(long double) __NDK_FPABI_MATH__  __pure2;
-int	__signbit(double) __NDK_FPABI_MATH__  __pure2;
-int	__signbitf(float) __NDK_FPABI_MATH__  __pure2;
-int	__signbitl(long double) __NDK_FPABI_MATH__  __pure2;
-
-double	acos(double) __NDK_FPABI_MATH__;
-double	asin(double) __NDK_FPABI_MATH__;
-double	atan(double) __NDK_FPABI_MATH__;
-double	atan2(double, double) __NDK_FPABI_MATH__;
-double	cos(double) __NDK_FPABI_MATH__;
-double	sin(double) __NDK_FPABI_MATH__;
-double	tan(double) __NDK_FPABI_MATH__;
-
-double	cosh(double) __NDK_FPABI_MATH__;
-double	sinh(double) __NDK_FPABI_MATH__;
-double	tanh(double) __NDK_FPABI_MATH__;
-
-double	exp(double) __NDK_FPABI_MATH__;
-double	frexp(double, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-double	ldexp(double, int) __NDK_FPABI_MATH__;
-double	log(double) __NDK_FPABI_MATH__;
-double	log10(double) __NDK_FPABI_MATH__;
-double	modf(double, double *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-double	pow(double, double) __NDK_FPABI_MATH__;
-double	sqrt(double) __NDK_FPABI_MATH__;
-
-double	ceil(double) __NDK_FPABI_MATH__;
-double	fabs(double) __NDK_FPABI_MATH__ __pure2;
-double	floor(double) __NDK_FPABI_MATH__;
-double	fmod(double, double) __NDK_FPABI_MATH__;
-
-/*
- * These functions are not in C90.
- */
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-double	acosh(double) __NDK_FPABI_MATH__;
-double	asinh(double) __NDK_FPABI_MATH__;
-double	atanh(double) __NDK_FPABI_MATH__;
-double	cbrt(double) __NDK_FPABI_MATH__;
-double	erf(double) __NDK_FPABI_MATH__;
-double	erfc(double) __NDK_FPABI_MATH__;
-double	exp2(double) __NDK_FPABI_MATH__;
-double	expm1(double) __NDK_FPABI_MATH__;
-double	fma(double, double, double) __NDK_FPABI_MATH__;
-double	hypot(double, double) __NDK_FPABI_MATH__;
-int	ilogb(double) __NDK_FPABI_MATH__ __pure2;
-int	(isinf)(double) __NDK_FPABI_MATH__ __pure2;
-int	(isnan)(double) __NDK_FPABI_MATH__ __pure2;
-double	lgamma(double) __NDK_FPABI_MATH__;
-long long llrint(double) __NDK_FPABI_MATH__;
-long long llround(double) __NDK_FPABI_MATH__;
-double	log1p(double) __NDK_FPABI_MATH__;
-double	log2(double) __NDK_FPABI_MATH__;
-double	logb(double) __NDK_FPABI_MATH__;
-long	lrint(double) __NDK_FPABI_MATH__;
-long	lround(double) __NDK_FPABI_MATH__;
-double	nan(const char *) __NDK_FPABI_MATH__ __pure2;
-double	nextafter(double, double) __NDK_FPABI_MATH__;
-double	remainder(double, double) __NDK_FPABI_MATH__;
-double	remquo(double, double, int *) __NDK_FPABI_MATH__;
-double	rint(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __XSI_VISIBLE
-double	j0(double) __NDK_FPABI_MATH__;
-double	j1(double) __NDK_FPABI_MATH__;
-double	jn(int, double) __NDK_FPABI_MATH__;
-double	y0(double) __NDK_FPABI_MATH__;
-double	y1(double) __NDK_FPABI_MATH__;
-double	yn(int, double) __NDK_FPABI_MATH__;
-
-#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
-double	gamma(double) __NDK_FPABI_MATH__;
-#endif
-
-#if __XSI_VISIBLE <= 600 || __BSD_VISIBLE
-double	scalb(double, double) __NDK_FPABI_MATH__;
-#endif
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-double	copysign(double, double) __NDK_FPABI_MATH__ __pure2;
-double	fdim(double, double) __NDK_FPABI_MATH__;
-double	fmax(double, double) __NDK_FPABI_MATH__ __pure2;
-double	fmin(double, double) __NDK_FPABI_MATH__ __pure2;
-double	nearbyint(double) __NDK_FPABI_MATH__;
-double	round(double) __NDK_FPABI_MATH__;
-double	scalbln(double, long) __NDK_FPABI_MATH__;
-double	scalbn(double, int) __NDK_FPABI_MATH__;
-double	tgamma(double) __NDK_FPABI_MATH__;
-double	trunc(double) __NDK_FPABI_MATH__;
-#endif
-
-/*
- * BSD math library entry points
- */
-#if __BSD_VISIBLE
-double	drem(double, double) __NDK_FPABI_MATH__;
-int	finite(double) __NDK_FPABI_MATH__ __pure2;
-int	isnanf(float) __NDK_FPABI_MATH__ __pure2;
-long double significandl(long double) __NDK_FPABI_MATH__;
-
-/*
- * Reentrant version of gamma & lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-double	gamma_r(double, int *) __NDK_FPABI_MATH__;
-double	lgamma_r(double, int *) __NDK_FPABI_MATH__;
-
-/*
- * IEEE Test Vector
- */
-double	significand(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE */
-
-/* float versions of ANSI/POSIX functions */
-#if __ISO_C_VISIBLE >= 1999
-float	acosf(float) __NDK_FPABI_MATH__;
-float	asinf(float) __NDK_FPABI_MATH__;
-float	atanf(float) __NDK_FPABI_MATH__;
-float	atan2f(float, float) __NDK_FPABI_MATH__;
-float	cosf(float) __NDK_FPABI_MATH__;
-float	sinf(float) __NDK_FPABI_MATH__;
-float	tanf(float) __NDK_FPABI_MATH__;
-
-float	coshf(float) __NDK_FPABI_MATH__;
-float	sinhf(float) __NDK_FPABI_MATH__;
-float	tanhf(float) __NDK_FPABI_MATH__;
-
-float	exp2f(float) __NDK_FPABI_MATH__;
-float	expf(float) __NDK_FPABI_MATH__;
-float	expm1f(float) __NDK_FPABI_MATH__;
-float	frexpf(float, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-int	ilogbf(float) __NDK_FPABI_MATH__ __pure2;
-float	ldexpf(float, int) __NDK_FPABI_MATH__;
-float	log10f(float) __NDK_FPABI_MATH__;
-float	log1pf(float) __NDK_FPABI_MATH__;
-float	log2f(float) __NDK_FPABI_MATH__;
-float	logf(float) __NDK_FPABI_MATH__;
-float	modff(float, float *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-float	powf(float, float) __NDK_FPABI_MATH__;
-float	sqrtf(float) __NDK_FPABI_MATH__;
-
-float	ceilf(float) __NDK_FPABI_MATH__;
-float	fabsf(float) __NDK_FPABI_MATH__ __pure2;
-float	floorf(float) __NDK_FPABI_MATH__;
-float	fmodf(float, float) __NDK_FPABI_MATH__;
-float	roundf(float) __NDK_FPABI_MATH__;
-
-float	erff(float) __NDK_FPABI_MATH__;
-float	erfcf(float) __NDK_FPABI_MATH__;
-float	hypotf(float, float) __NDK_FPABI_MATH__;
-float	lgammaf(float) __NDK_FPABI_MATH__;
-float	tgammaf(float) __NDK_FPABI_MATH__;
-
-float	acoshf(float) __NDK_FPABI_MATH__;
-float	asinhf(float) __NDK_FPABI_MATH__;
-float	atanhf(float) __NDK_FPABI_MATH__;
-float	cbrtf(float) __NDK_FPABI_MATH__;
-float	logbf(float) __NDK_FPABI_MATH__;
-float	copysignf(float, float) __NDK_FPABI_MATH__ __pure2;
-long long llrintf(float) __NDK_FPABI_MATH__;
-long long llroundf(float) __NDK_FPABI_MATH__;
-long	lrintf(float) __NDK_FPABI_MATH__;
-long	lroundf(float) __NDK_FPABI_MATH__;
-float	nanf(const char *) __NDK_FPABI_MATH__ __pure2;
-float	nearbyintf(float) __NDK_FPABI_MATH__;
-float	nextafterf(float, float) __NDK_FPABI_MATH__;
-float	remainderf(float, float) __NDK_FPABI_MATH__;
-float	remquof(float, float, int *) __NDK_FPABI_MATH__;
-float	rintf(float) __NDK_FPABI_MATH__;
-float	scalblnf(float, long) __NDK_FPABI_MATH__;
-float	scalbnf(float, int) __NDK_FPABI_MATH__;
-float	truncf(float) __NDK_FPABI_MATH__;
-
-float	fdimf(float, float) __NDK_FPABI_MATH__;
-float	fmaf(float, float, float) __NDK_FPABI_MATH__;
-float	fmaxf(float, float) __NDK_FPABI_MATH__ __pure2;
-float	fminf(float, float) __NDK_FPABI_MATH__ __pure2;
-#endif
-
-/*
- * float versions of BSD math library entry points
- */
-#if __BSD_VISIBLE
-float	dremf(float, float) __NDK_FPABI_MATH__;
-int	finitef(float) __NDK_FPABI_MATH__ __pure2;
-float	gammaf(float) __NDK_FPABI_MATH__;
-float	j0f(float) __NDK_FPABI_MATH__;
-float	j1f(float) __NDK_FPABI_MATH__;
-float	jnf(int, float) __NDK_FPABI_MATH__;
-float	scalbf(float, float) __NDK_FPABI_MATH__;
-float	y0f(float) __NDK_FPABI_MATH__;
-float	y1f(float) __NDK_FPABI_MATH__;
-float	ynf(int, float) __NDK_FPABI_MATH__;
-
-/*
- * Float versions of reentrant version of gamma & lgamma; passes
- * signgam back by reference as the second argument; user must
- * allocate space for signgam.
- */
-float	gammaf_r(float, int *) __NDK_FPABI_MATH__;
-float	lgammaf_r(float, int *) __NDK_FPABI_MATH__;
-
-/*
- * float version of IEEE Test Vector
- */
-float	significandf(float) __NDK_FPABI_MATH__;
-#endif	/* __BSD_VISIBLE */
-
-/*
- * long double versions of ISO/POSIX math functions
- */
-#if __ISO_C_VISIBLE >= 1999
-long double	acoshl(long double) __NDK_FPABI_MATH__;
-long double	acosl(long double) __NDK_FPABI_MATH__;
-long double	asinhl(long double) __NDK_FPABI_MATH__;
-long double	asinl(long double) __NDK_FPABI_MATH__;
-long double	atan2l(long double, long double) __NDK_FPABI_MATH__;
-long double	atanhl(long double) __NDK_FPABI_MATH__;
-long double	atanl(long double) __NDK_FPABI_MATH__;
-long double	cbrtl(long double) __NDK_FPABI_MATH__;
-long double	ceill(long double) __NDK_FPABI_MATH__;
-long double	copysignl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	coshl(long double) __NDK_FPABI_MATH__;
-long double	cosl(long double) __NDK_FPABI_MATH__;
-long double	erfcl(long double) __NDK_FPABI_MATH__;
-long double	erfl(long double) __NDK_FPABI_MATH__;
-long double	exp2l(long double) __NDK_FPABI_MATH__;
-long double	expl(long double) __NDK_FPABI_MATH__;
-long double	expm1l(long double) __NDK_FPABI_MATH__;
-long double	fabsl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	fdiml(long double, long double) __NDK_FPABI_MATH__;
-long double	floorl(long double) __NDK_FPABI_MATH__;
-long double	fmal(long double, long double, long double) __NDK_FPABI_MATH__;
-long double	fmaxl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	fminl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	fmodl(long double, long double) __NDK_FPABI_MATH__;
-long double	frexpl(long double value, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	hypotl(long double, long double) __NDK_FPABI_MATH__;
-int		ilogbl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	ldexpl(long double, int) __NDK_FPABI_MATH__;
-long double	lgammal(long double) __NDK_FPABI_MATH__;
-long long	llrintl(long double) __NDK_FPABI_MATH__;
-long long	llroundl(long double) __NDK_FPABI_MATH__;
-long double	log10l(long double) __NDK_FPABI_MATH__;
-long double	log1pl(long double) __NDK_FPABI_MATH__;
-long double	log2l(long double) __NDK_FPABI_MATH__;
-long double	logbl(long double) __NDK_FPABI_MATH__;
-long double	logl(long double) __NDK_FPABI_MATH__;
-long		lrintl(long double) __NDK_FPABI_MATH__;
-long		lroundl(long double) __NDK_FPABI_MATH__;
-long double	modfl(long double, long double *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	nanl(const char *) __NDK_FPABI_MATH__ __pure2;
-long double	nearbyintl(long double) __NDK_FPABI_MATH__;
-long double	nextafterl(long double, long double) __NDK_FPABI_MATH__;
-double		nexttoward(double, long double) __NDK_FPABI_MATH__;
-float		nexttowardf(float, long double) __NDK_FPABI_MATH__;
-long double	nexttowardl(long double, long double) __NDK_FPABI_MATH__;
-long double	powl(long double, long double) __NDK_FPABI_MATH__;
-long double	remainderl(long double, long double) __NDK_FPABI_MATH__;
-long double	remquol(long double, long double, int *) __NDK_FPABI_MATH__;
-long double	rintl(long double) __NDK_FPABI_MATH__;
-long double	roundl(long double) __NDK_FPABI_MATH__;
-long double	scalblnl(long double, long) __NDK_FPABI_MATH__;
-long double	scalbnl(long double, int) __NDK_FPABI_MATH__;
-long double	sinhl(long double) __NDK_FPABI_MATH__;
-long double	sinl(long double) __NDK_FPABI_MATH__;
-long double	sqrtl(long double) __NDK_FPABI_MATH__;
-long double	tanhl(long double) __NDK_FPABI_MATH__;
-long double	tanl(long double) __NDK_FPABI_MATH__;
-long double	tgammal(long double) __NDK_FPABI_MATH__;
-long double	truncl(long double) __NDK_FPABI_MATH__;
-
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-#if defined(_GNU_SOURCE)
-void sincos(double, double*, double*) __NDK_FPABI_MATH__;
-void sincosf(float, float*, float*) __NDK_FPABI_MATH__;
-void sincosl(long double, long double*, long double*) __NDK_FPABI_MATH__;
-#endif /* _GNU_SOURCE */
-
-/* builtin version of all the above math functions are annotated too */
-
-double	__builtin_acos(double) __NDK_FPABI_MATH__;
-double	__builtin_asin(double) __NDK_FPABI_MATH__;
-double	__builtin_atan(double) __NDK_FPABI_MATH__;
-double	__builtin_atan2(double, double) __NDK_FPABI_MATH__;
-double	__builtin_cos(double) __NDK_FPABI_MATH__;
-double	__builtin_sin(double) __NDK_FPABI_MATH__;
-double	__builtin_tan(double) __NDK_FPABI_MATH__;
-
-double	__builtin_cosh(double) __NDK_FPABI_MATH__;
-double	__builtin_sinh(double) __NDK_FPABI_MATH__;
-double	__builtin_tanh(double) __NDK_FPABI_MATH__;
-
-double	__builtin_exp(double) __NDK_FPABI_MATH__;
-double	__builtin_frexp(double, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-double	__builtin_ldexp(double, int) __NDK_FPABI_MATH__;
-double	__builtin_log(double) __NDK_FPABI_MATH__;
-double	__builtin_log10(double) __NDK_FPABI_MATH__;
-double	__builtin_modf(double, double *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-double	__builtin_pow(double, double) __NDK_FPABI_MATH__;
-double	__builtin_sqrt(double) __NDK_FPABI_MATH__;
-
-double	__builtin_ceil(double) __NDK_FPABI_MATH__;
-double	__builtin_fabs(double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_floor(double) __NDK_FPABI_MATH__;
-double	__builtin_fmod(double, double) __NDK_FPABI_MATH__;
-
-/*
- * These functions are not in C90.
- */
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-double	__builtin_acosh(double) __NDK_FPABI_MATH__;
-double	__builtin_asinh(double) __NDK_FPABI_MATH__;
-double	__builtin_atanh(double) __NDK_FPABI_MATH__;
-double	__builtin_cbrt(double) __NDK_FPABI_MATH__;
-double	__builtin_erf(double) __NDK_FPABI_MATH__;
-double	__builtin_erfc(double) __NDK_FPABI_MATH__;
-double	__builtin_exp2(double) __NDK_FPABI_MATH__;
-double	__builtin_expm1(double) __NDK_FPABI_MATH__;
-double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
-double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
-int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
-int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
-int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
-#else
-/* clang < 3.5 has faulty prototype for __builtin_isnan */
-#endif
-double	__builtin_lgamma(double) __NDK_FPABI_MATH__;
-long long __builtin_llrint(double) __NDK_FPABI_MATH__;
-long long __builtin_llround(double) __NDK_FPABI_MATH__;
-double	__builtin_log1p(double) __NDK_FPABI_MATH__;
-double	__builtin_log2(double) __NDK_FPABI_MATH__;
-double	__builtin_logb(double) __NDK_FPABI_MATH__;
-long	__builtin_lrint(double) __NDK_FPABI_MATH__;
-long	__builtin_lround(double) __NDK_FPABI_MATH__;
-double	__builtin_nan(const char *) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_nextafter(double, double) __NDK_FPABI_MATH__;
-double	__builtin_remainder(double, double) __NDK_FPABI_MATH__;
-double	__builtin_remquo(double, double, int *) __NDK_FPABI_MATH__;
-double	__builtin_rint(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __XSI_VISIBLE
-double	__builtin_j0(double) __NDK_FPABI_MATH__;
-double	__builtin_j1(double) __NDK_FPABI_MATH__;
-double	__builtin_jn(int, double) __NDK_FPABI_MATH__;
-double	__builtin_y0(double) __NDK_FPABI_MATH__;
-double	__builtin_y1(double) __NDK_FPABI_MATH__;
-double	__builtin_yn(int, double) __NDK_FPABI_MATH__;
-
-#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
-double	__builtin_gamma(double) __NDK_FPABI_MATH__;
-#endif
-
-#if __XSI_VISIBLE <= 600 || __BSD_VISIBLE
-double	__builtin_scalb(double, double) __NDK_FPABI_MATH__;
-#endif
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-double	__builtin_copysign(double, double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_fdim(double, double) __NDK_FPABI_MATH__;
-double	__builtin_fmax(double, double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_fmin(double, double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_nearbyint(double) __NDK_FPABI_MATH__;
-double	__builtin_round(double) __NDK_FPABI_MATH__;
-double	__builtin_scalbln(double, long) __NDK_FPABI_MATH__;
-double	__builtin_scalbn(double, int) __NDK_FPABI_MATH__;
-double	__builtin_tgamma(double) __NDK_FPABI_MATH__;
-double	__builtin_trunc(double) __NDK_FPABI_MATH__;
-#endif
-
-/*
- * BSD math library entry points
- */
-#if __BSD_VISIBLE
-double	__builtin_drem(double, double) __NDK_FPABI_MATH__;
-int	__builtin_finite(double) __NDK_FPABI_MATH__ __pure2;
-int	__builtin_isnanf(float) __NDK_FPABI_MATH__ __pure2;
-long double significandl(long double) __NDK_FPABI_MATH__;
-
-/*
- * Reentrant version of gamma & lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-double	__builtin_gamma_r(double, int *) __NDK_FPABI_MATH__;
-double	__builtin_lgamma_r(double, int *) __NDK_FPABI_MATH__;
-
-/*
- * IEEE Test Vector
- */
-double	__builtin_significand(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE */
-
-/* float versions of ANSI/POSIX functions */
-#if __ISO_C_VISIBLE >= 1999
-float	__builtin_acosf(float) __NDK_FPABI_MATH__;
-float	__builtin_asinf(float) __NDK_FPABI_MATH__;
-float	__builtin_atanf(float) __NDK_FPABI_MATH__;
-float	__builtin_atan2f(float, float) __NDK_FPABI_MATH__;
-float	__builtin_cosf(float) __NDK_FPABI_MATH__;
-float	__builtin_sinf(float) __NDK_FPABI_MATH__;
-float	__builtin_tanf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_coshf(float) __NDK_FPABI_MATH__;
-float	__builtin_sinhf(float) __NDK_FPABI_MATH__;
-float	__builtin_tanhf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_exp2f(float) __NDK_FPABI_MATH__;
-float	__builtin_expf(float) __NDK_FPABI_MATH__;
-float	__builtin_expm1f(float) __NDK_FPABI_MATH__;
-float	__builtin_frexpf(float, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-int	__builtin_ilogbf(float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_ldexpf(float, int) __NDK_FPABI_MATH__;
-float	__builtin_log10f(float) __NDK_FPABI_MATH__;
-float	__builtin_log1pf(float) __NDK_FPABI_MATH__;
-float	__builtin_log2f(float) __NDK_FPABI_MATH__;
-float	__builtin_logf(float) __NDK_FPABI_MATH__;
-float	__builtin_modff(float, float *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-float	__builtin_powf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_sqrtf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_ceilf(float) __NDK_FPABI_MATH__;
-float	__builtin_fabsf(float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_floorf(float) __NDK_FPABI_MATH__;
-float	__builtin_fmodf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_roundf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_erff(float) __NDK_FPABI_MATH__;
-float	__builtin_erfcf(float) __NDK_FPABI_MATH__;
-float	__builtin_hypotf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_lgammaf(float) __NDK_FPABI_MATH__;
-float	__builtin_tgammaf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_acoshf(float) __NDK_FPABI_MATH__;
-float	__builtin_asinhf(float) __NDK_FPABI_MATH__;
-float	__builtin_atanhf(float) __NDK_FPABI_MATH__;
-float	__builtin_cbrtf(float) __NDK_FPABI_MATH__;
-float	__builtin_logbf(float) __NDK_FPABI_MATH__;
-float	__builtin_copysignf(float, float) __NDK_FPABI_MATH__ __pure2;
-long long __builtin_llrintf(float) __NDK_FPABI_MATH__;
-long long __builtin_llroundf(float) __NDK_FPABI_MATH__;
-long	__builtin_lrintf(float) __NDK_FPABI_MATH__;
-long	__builtin_lroundf(float) __NDK_FPABI_MATH__;
-float	__builtin_nanf(const char *) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_nearbyintf(float) __NDK_FPABI_MATH__;
-float	__builtin_nextafterf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_remainderf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_remquof(float, float, int *) __NDK_FPABI_MATH__;
-float	__builtin_rintf(float) __NDK_FPABI_MATH__;
-float	__builtin_scalblnf(float, long) __NDK_FPABI_MATH__;
-float	__builtin_scalbnf(float, int) __NDK_FPABI_MATH__;
-float	__builtin_truncf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_fdimf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_fmaf(float, float, float) __NDK_FPABI_MATH__;
-float	__builtin_fmaxf(float, float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_fminf(float, float) __NDK_FPABI_MATH__ __pure2;
-#endif
-
-/*
- * float versions of BSD math library entry points
- */
-#if __BSD_VISIBLE
-float	__builtin_dremf(float, float) __NDK_FPABI_MATH__;
-int	__builtin_finitef(float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_gammaf(float) __NDK_FPABI_MATH__;
-float	__builtin_j0f(float) __NDK_FPABI_MATH__;
-float	__builtin_j1f(float) __NDK_FPABI_MATH__;
-float	__builtin_jnf(int, float) __NDK_FPABI_MATH__;
-float	__builtin_scalbf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_y0f(float) __NDK_FPABI_MATH__;
-float	__builtin_y1f(float) __NDK_FPABI_MATH__;
-float	__builtin_ynf(int, float) __NDK_FPABI_MATH__;
-
-/*
- * Float versions of reentrant version of gamma & lgamma; passes
- * signgam back by reference as the second argument; user must
- * allocate space for signgam.
- */
-float	__builtin_gammaf_r(float, int *) __NDK_FPABI_MATH__;
-float	__builtin_lgammaf_r(float, int *) __NDK_FPABI_MATH__;
-
-/*
- * float version of IEEE Test Vector
- */
-float	__builtin_significandf(float) __NDK_FPABI_MATH__;
-#endif	/* __BSD_VISIBLE */
-
-/*
- * long double versions of ISO/POSIX math functions
- */
-#if __ISO_C_VISIBLE >= 1999
-long double	__builtin_acoshl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_acosl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_asinhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_asinl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_atan2l(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_atanhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_atanl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_cbrtl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_ceill(long double) __NDK_FPABI_MATH__;
-long double	__builtin_copysignl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_coshl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_cosl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_erfcl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_erfl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_exp2l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_expl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_expm1l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_fabsl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_fdiml(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_floorl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_fmal(long double, long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_fmaxl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_fminl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_fmodl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_frexpl(long double value, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	__builtin_hypotl(long double, long double) __NDK_FPABI_MATH__;
-int		__builtin_ilogbl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_ldexpl(long double, int) __NDK_FPABI_MATH__;
-long double	__builtin_lgammal(long double) __NDK_FPABI_MATH__;
-long long	__builtin_llrintl(long double) __NDK_FPABI_MATH__;
-long long	__builtin_llroundl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_log10l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_log1pl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_log2l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_logbl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_logl(long double) __NDK_FPABI_MATH__;
-long		__builtin_lrintl(long double) __NDK_FPABI_MATH__;
-long		__builtin_lroundl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_modfl(long double, long double *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	__builtin_nanl(const char *) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_nearbyintl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_nextafterl(long double, long double) __NDK_FPABI_MATH__;
-double		__builtin_nexttoward(double, long double) __NDK_FPABI_MATH__;
-float		__builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__;
-long double	__builtin_nexttowardl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_powl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_remainderl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_remquol(long double, long double, int *) __NDK_FPABI_MATH__;
-long double	__builtin_rintl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_roundl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_scalblnl(long double, long) __NDK_FPABI_MATH__;
-long double	__builtin_scalbnl(long double, int) __NDK_FPABI_MATH__;
-long double	__builtin_sinhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_sinl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_sqrtl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_tanhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_tanl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_tgammal(long double) __NDK_FPABI_MATH__;
-long double	__builtin_truncl(long double) __NDK_FPABI_MATH__;
-
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-#if defined(_GNU_SOURCE)
-void __builtin_sincos(double, double*, double*) __NDK_FPABI_MATH__;
-void __builtin_sincosf(float, float*, float*) __NDK_FPABI_MATH__;
-void __builtin_sincosl(long double, long double*, long double*) __NDK_FPABI_MATH__;
-#endif /* _GNU_SOURCE */
-
-#pragma GCC visibility pop
-__END_DECLS
-
-#endif /* !_MATH_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/signal.h b/9/platforms/android-19/arch-mips64/usr/include/signal.h
deleted file mode 100644
index f1849c5..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/signal.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _SIGNAL_H_
-#define _SIGNAL_H_
-
-#include <errno.h>
-#include <sys/cdefs.h>
-#include <limits.h>		/* For LONG_BIT */
-#include <string.h>		/* For memset() */
-#include <sys/types.h>
-#include <asm/sigcontext.h>
-
-#if defined(__LP64__) || defined(__mips__)
-/* For 64-bit (and mips), the kernel's struct sigaction doesn't match the POSIX one,
- * so we need to expose our own and translate behind the scenes. */
-#  define sigaction __kernel_sigaction
-#  include <linux/signal.h>
-#  undef sigaction
-#else
-/* For 32-bit, we're stuck with the definitions we already shipped,
- * even though they contain a sigset_t that's too small. */
-#  include <linux/signal.h>
-#endif
-
-__BEGIN_DECLS
-
-typedef int sig_atomic_t;
-
-/* The arm and x86 kernel header files don't define _NSIG. */
-#ifndef _KERNEL__NSIG
-#define _KERNEL__NSIG 64
-#endif
-
-/* Userspace's NSIG is the kernel's _NSIG + 1. */
-#define _NSIG (_KERNEL__NSIG + 1)
-#define NSIG _NSIG
-
-/* We take a few real-time signals for ourselves. May as well use the same names as glibc. */
-#define SIGRTMIN (__libc_current_sigrtmin())
-#define SIGRTMAX (__libc_current_sigrtmax())
-extern int __libc_current_sigrtmin(void);
-extern int __libc_current_sigrtmax(void);
-
-extern const char* const sys_siglist[];
-extern const char* const sys_signame[]; /* BSD compatibility. */
-
-typedef __sighandler_t sig_t; /* BSD compatibility. */
-typedef __sighandler_t sighandler_t; /* glibc compatibility. */
-
-#define si_timerid si_tid /* glibc compatibility. */
-
-#if defined(__LP64__)
-
-struct sigaction {
-  unsigned int sa_flags;
-  union {
-    sighandler_t sa_handler;
-    void (*sa_sigaction)(int, struct siginfo*, void*);
-  };
-  sigset_t sa_mask;
-  void (*sa_restorer)(void);
-};
-
-#elif defined(__mips__)
-
-struct sigaction {
-  unsigned int sa_flags;
-  union {
-    sighandler_t sa_handler;
-    void (*sa_sigaction) (int, struct siginfo*, void*);
-  };
-  sigset_t sa_mask;
-};
-
-#endif
-
-extern int sigaction(int, const struct sigaction*, struct sigaction*);
-
-extern sighandler_t signal(int, sighandler_t);
-
-extern int siginterrupt(int, int);
-
-extern int sigaddset(sigset_t*, int);
-extern int sigdelset(sigset_t*, int);
-extern int sigemptyset(sigset_t*);
-extern int sigfillset(sigset_t*);
-extern int sigismember(const sigset_t*, int);
-
-extern int sigpending(sigset_t*) __nonnull((1));
-extern int sigprocmask(int, const sigset_t*, sigset_t*);
-extern int sigsuspend(const sigset_t*) __nonnull((1));
-extern int sigwait(const sigset_t*, int*) __nonnull((1, 2));
-
-extern int raise(int);
-extern int kill(pid_t, int);
-extern int killpg(int, int);
-
-extern int sigaltstack(const stack_t*, stack_t*);
-
-extern void psiginfo(const siginfo_t*, const char*);
-extern void psignal(int, const char*);
-
-__END_DECLS
-
-#endif /* _SIGNAL_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/stdatomic.h b/9/platforms/android-19/arch-mips64/usr/include/stdatomic.h
deleted file mode 100644
index 3db25a7..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/stdatomic.h
+++ /dev/null
@@ -1,575 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
- *                    David Chisnall <theraven@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _STDATOMIC_H_
-#define	_STDATOMIC_H_
-
-#include <sys/cdefs.h>
-
-
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
-# ifdef __clang__
-#  if __has_feature(cxx_atomic)
-#   define _STDATOMIC_HAVE_ATOMIC
-#  endif
-# else /* gcc */
-#  if __GNUC_PREREQ(4, 7)
-#   define _STDATOMIC_HAVE_ATOMIC
-#  endif
-# endif
-#endif
-
-#ifdef _STDATOMIC_HAVE_ATOMIC
-
-/* We have a usable C++ <atomic>; use it instead.  */
-
-#include <atomic>
-
-#undef _Atomic
-        /* Also defined by <atomic> for gcc.  But not used in macros. */
-        /* Also a clang intrinsic.                                    */
-        /* Should not be used by client code before this file is      */
-        /* included.  The definitions in <atomic> themselves see      */
-        /* the old definition, as they should.                        */
-        /* Client code sees the following definition.                 */
-
-#define _Atomic(t) std::atomic<t>
-
-using std::atomic_is_lock_free;
-using std::atomic_init;
-using std::atomic_store;
-using std::atomic_store_explicit;
-using std::atomic_load;
-using std::atomic_load_explicit;
-using std::atomic_exchange;
-using std::atomic_exchange_explicit;
-using std::atomic_compare_exchange_strong;
-using std::atomic_compare_exchange_strong_explicit;
-using std::atomic_compare_exchange_weak;
-using std::atomic_compare_exchange_weak_explicit;
-using std::atomic_fetch_add;
-using std::atomic_fetch_add_explicit;
-using std::atomic_fetch_sub;
-using std::atomic_fetch_sub_explicit;
-using std::atomic_fetch_or;
-using std::atomic_fetch_or_explicit;
-using std::atomic_fetch_xor;
-using std::atomic_fetch_xor_explicit;
-using std::atomic_fetch_and;
-using std::atomic_fetch_and_explicit;
-using std::atomic_thread_fence;
-using std::atomic_signal_fence;
-
-using std::memory_order;
-using std::memory_order_relaxed;
-using std::memory_order_consume;
-using std::memory_order_release;
-using std::memory_order_acq_rel;
-using std::memory_order_seq_cst;
-
-using std::atomic_bool;
-using std::atomic_char;
-using std::atomic_schar;
-using std::atomic_uchar;
-using std::atomic_short;
-using std::atomic_ushort;
-using std::atomic_int;
-using std::atomic_uint;
-using std::atomic_long;
-using std::atomic_ulong;
-using std::atomic_llong;
-using std::atomic_ullong;
-using std::atomic_char16_t;
-using std::atomic_char32_t;
-using std::atomic_wchar_t;
-using std::atomic_int_least8_t;
-using std::atomic_uint_least8_t;
-using std::atomic_int_least16_t;
-using std::atomic_uint_least16_t;
-using std::atomic_int_least32_t;
-using std::atomic_uint_least32_t;
-using std::atomic_int_least64_t;
-using std::atomic_uint_least64_t;
-using std::atomic_int_fast8_t;
-using std::atomic_uint_fast8_t;
-using std::atomic_int_fast16_t;
-using std::atomic_uint_fast16_t;
-using std::atomic_int_fast32_t;
-using std::atomic_uint_fast32_t;
-using std::atomic_int_fast64_t;
-using std::atomic_uint_fast64_t;
-using std::atomic_intptr_t;
-using std::atomic_uintptr_t;
-using std::atomic_size_t;
-using std::atomic_ptrdiff_t;
-using std::atomic_intmax_t;
-using std::atomic_uintmax_t;
-
-#else /* <atomic> unavailable, possibly because this is C, not C++ */
-
-#include <sys/types.h>
-#include <stdbool.h>
-
-/*
- * C: Do it ourselves.
- * Note that the runtime representation defined here should be compatible
- * with the C++ one, i.e. an _Atomic(T) needs to contain the same
- * bits as a T.
- */
-
-#include <stddef.h>  /* For ptrdiff_t.                          */
-#include <stdint.h>  /* TODO: Should pollute namespace less.    */
-#if __STDC_VERSION__ >= 201112L
-# include <uchar.h>  /* For char16_t and char32_t.              */
-#endif
-
-#ifdef __clang__
-# if __has_extension(c_atomic) || __has_extension(cxx_atomic)
-#  define       __CLANG_ATOMICS
-# else
-#  error "stdatomic.h does not support your compiler"
-# endif
-# if __has_builtin(__sync_swap)
-#  define __HAS_BUILTIN_SYNC_SWAP
-# endif
-#else
-# if __GNUC_PREREQ(4, 7)
-#  define	__GNUC_ATOMICS
-# else
-#  define	__SYNC_ATOMICS
-#  ifdef __cplusplus
-#   define       __ATOMICS_AVOID_DOT_INIT
-#  endif
-# endif
-#endif
-
-/*
- * 7.17.1 Atomic lock-free macros.
- */
-
-#ifdef __GCC_ATOMIC_BOOL_LOCK_FREE
-#define	ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_BOOL_LOCK_FREE           2 /* For all modern platforms */
-#endif
-#ifdef __GCC_ATOMIC_CHAR_LOCK_FREE
-#define	ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_CHAR_LOCK_FREE           2
-#endif
-#ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define	ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_CHAR16_T_LOCK_FREE       2
-#endif
-#ifdef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define	ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_CHAR32_T_LOCK_FREE       2
-#endif
-#ifdef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define	ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_WCHAR_T_LOCK_FREE        2
-#endif
-#ifdef __GCC_ATOMIC_SHORT_LOCK_FREE
-#define	ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_SHORT_LOCK_FREE          2
-#endif
-#ifdef __GCC_ATOMIC_INT_LOCK_FREE
-#define	ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_INT_LOCK_FREE            2
-#endif
-#ifdef __GCC_ATOMIC_LONG_LOCK_FREE
-#define	ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_LONG_LOCK_FREE           2
-#endif
-#ifdef __GCC_ATOMIC_LLONG_LOCK_FREE
-#define	ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_LLONG_LOCK_FREE          1 /* maybe */
-#endif
-#ifdef __GCC_ATOMIC_POINTER_LOCK_FREE
-#define	ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_POINTER_LOCK_FREE        2
-#endif
-
-/*
- * 7.17.2 Initialization.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	ATOMIC_VAR_INIT(value)		(value)
-#define	atomic_init(obj, value)		__c11_atomic_init(obj, value)
-#else
-#ifdef __ATOMICS_AVOID_DOT_INIT
-#define	ATOMIC_VAR_INIT(value)		{ value }
-#else
-#define	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
-#endif
-#define	atomic_init(obj, value)		((void)((obj)->__val = (value)))
-#endif
-
-/*
- * Clang and recent GCC both provide predefined macros for the memory
- * orderings.  If we are using a compiler that doesn't define them, use the
- * clang values - these will be ignored in the fallback path.
- */
-
-#ifndef __ATOMIC_RELAXED
-#define __ATOMIC_RELAXED		0
-#endif
-#ifndef __ATOMIC_CONSUME
-#define __ATOMIC_CONSUME		1
-#endif
-#ifndef __ATOMIC_ACQUIRE
-#define __ATOMIC_ACQUIRE		2
-#endif
-#ifndef __ATOMIC_RELEASE
-#define __ATOMIC_RELEASE		3
-#endif
-#ifndef __ATOMIC_ACQ_REL
-#define __ATOMIC_ACQ_REL		4
-#endif
-#ifndef __ATOMIC_SEQ_CST
-#define __ATOMIC_SEQ_CST		5
-#endif
-
-/*
- * 7.17.3 Order and consistency.
- *
- * The memory_order_* constants that denote the barrier behaviour of the
- * atomic operations.
- * The enum values must be identical to those used by the
- * C++ <atomic> header.
- */
-
-typedef enum {
-	memory_order_relaxed = __ATOMIC_RELAXED,
-	memory_order_consume = __ATOMIC_CONSUME,
-	memory_order_acquire = __ATOMIC_ACQUIRE,
-	memory_order_release = __ATOMIC_RELEASE,
-	memory_order_acq_rel = __ATOMIC_ACQ_REL,
-	memory_order_seq_cst = __ATOMIC_SEQ_CST
-} memory_order;
-
-/*
- * 7.17.4 Fences.
- */
-
-static __inline void
-atomic_thread_fence(memory_order __order __attribute__((unused)))
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_thread_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_thread_fence(__order);
-#else
-	__sync_synchronize();
-#endif
-}
-
-static __inline void
-atomic_signal_fence(memory_order __order __attribute__((unused)))
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_signal_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_signal_fence(__order);
-#else
-	__asm volatile ("" ::: "memory");
-#endif
-}
-
-/*
- * 7.17.5 Lock-free property.
- */
-
-#if defined(_KERNEL)
-/* Atomics in kernelspace are always lock-free. */
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), (_Bool)1)
-#elif defined(__CLANG_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__c11_atomic_is_lock_free(sizeof(*(obj)))
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
-#else
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
-#endif
-
-/*
- * 7.17.6 Atomic integer types.
- */
-
-#ifndef __CLANG_ATOMICS
-/*
- * No native support for _Atomic(). Place object in structure to prevent
- * most forms of direct non-atomic access.
- */
-#define _Atomic(T)              struct { T volatile __val; }
-#endif
-
-typedef _Atomic(bool)			atomic_bool;
-typedef _Atomic(char)			atomic_char;
-typedef _Atomic(signed char)		atomic_schar;
-typedef _Atomic(unsigned char)		atomic_uchar;
-typedef _Atomic(short)			atomic_short;
-typedef _Atomic(unsigned short)		atomic_ushort;
-typedef _Atomic(int)			atomic_int;
-typedef _Atomic(unsigned int)		atomic_uint;
-typedef _Atomic(long)			atomic_long;
-typedef _Atomic(unsigned long)		atomic_ulong;
-typedef _Atomic(long long)		atomic_llong;
-typedef _Atomic(unsigned long long)	atomic_ullong;
-#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
-  typedef _Atomic(char16_t)		atomic_char16_t;
-  typedef _Atomic(char32_t)		atomic_char32_t;
-#endif
-typedef _Atomic(wchar_t)		atomic_wchar_t;
-typedef _Atomic(int_least8_t)		atomic_int_least8_t;
-typedef _Atomic(uint_least8_t)	atomic_uint_least8_t;
-typedef _Atomic(int_least16_t)	atomic_int_least16_t;
-typedef _Atomic(uint_least16_t)	atomic_uint_least16_t;
-typedef _Atomic(int_least32_t)	atomic_int_least32_t;
-typedef _Atomic(uint_least32_t)	atomic_uint_least32_t;
-typedef _Atomic(int_least64_t)	atomic_int_least64_t;
-typedef _Atomic(uint_least64_t)	atomic_uint_least64_t;
-typedef _Atomic(int_fast8_t)		atomic_int_fast8_t;
-typedef _Atomic(uint_fast8_t)		atomic_uint_fast8_t;
-typedef _Atomic(int_fast16_t)		atomic_int_fast16_t;
-typedef _Atomic(uint_fast16_t)	atomic_uint_fast16_t;
-typedef _Atomic(int_fast32_t)		atomic_int_fast32_t;
-typedef _Atomic(uint_fast32_t)	atomic_uint_fast32_t;
-typedef _Atomic(int_fast64_t)		atomic_int_fast64_t;
-typedef _Atomic(uint_fast64_t)	atomic_uint_fast64_t;
-typedef _Atomic(intptr_t)		atomic_intptr_t;
-typedef _Atomic(uintptr_t)		atomic_uintptr_t;
-typedef _Atomic(size_t)		atomic_size_t;
-typedef _Atomic(ptrdiff_t)		atomic_ptrdiff_t;
-typedef _Atomic(intmax_t)		atomic_intmax_t;
-typedef _Atomic(uintmax_t)		atomic_uintmax_t;
-
-/*
- * 7.17.7 Operations on atomic types.
- */
-
-/*
- * Compiler-specific operations.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
-	    success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
-	    success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__c11_atomic_exchange(object, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__c11_atomic_fetch_add(object, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__c11_atomic_fetch_and(object, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__c11_atomic_fetch_or(object, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__c11_atomic_fetch_sub(object, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__c11_atomic_fetch_xor(object, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__c11_atomic_load(object, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__c11_atomic_store(object, desired, order)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 0, success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 1, success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__atomic_exchange_n(&(object)->__val, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__atomic_fetch_add(&(object)->__val, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__atomic_fetch_and(&(object)->__val, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__atomic_fetch_or(&(object)->__val, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__atomic_fetch_sub(&(object)->__val, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__atomic_fetch_xor(&(object)->__val, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__atomic_load_n(&(object)->__val, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__atomic_store_n(&(object)->__val, desired, order)
-#else
-#define	__atomic_apply_stride(object, operand) \
-	(((__typeof__((object)->__val))0) + (operand))
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)	__extension__ ({			\
-	__typeof__(expected) __ep = (expected);				\
-	__typeof__(*__ep) __e = *__ep;					\
-	(void)(success); (void)(failure);				\
-	(bool)((*__ep = __sync_val_compare_and_swap(&(object)->__val,	\
-	    __e, desired)) == __e);					\
-})
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-		desired, success, failure)
-#ifdef __HAS_BUILTIN_SYNC_SWAP
-/* Clang provides a full-barrier atomic exchange - use it if available. */
-#define	atomic_exchange_explicit(object, desired, order)		\
-	((void)(order), __sync_swap(&(object)->__val, desired))
-#else
-/*
- * __sync_lock_test_and_set() is only an acquire barrier in theory (although in
- * practice it is usually a full barrier) so we need an explicit barrier before
- * it.
- */
-#define	atomic_exchange_explicit(object, desired, order)		\
-__extension__ ({							\
-	__typeof__(object) __o = (object);				\
-	__typeof__(desired) __d = (desired);				\
-	(void)(order);							\
-	__sync_synchronize();						\
-	__sync_lock_test_and_set(&(__o)->__val, __d);			\
-})
-#endif
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_add(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_and(&(object)->__val, operand))
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_or(&(object)->__val, operand))
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_sub(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_xor(&(object)->__val, operand))
-#define	atomic_load_explicit(object, order)				\
-	((void)(order), __sync_fetch_and_add(&(object)->__val, 0))
-#define	atomic_store_explicit(object, desired, order)			\
-	((void)atomic_exchange_explicit(object, desired, order))
-#endif
-
-/*
- * Convenience functions.
- *
- * Don't provide these in kernel space. In kernel space, we should be
- * disciplined enough to always provide explicit barriers.
- */
-
-#ifndef _KERNEL
-#define	atomic_compare_exchange_strong(object, expected, desired)	\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_compare_exchange_weak(object, expected, desired)		\
-	atomic_compare_exchange_weak_explicit(object, expected,		\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_exchange(object, desired)				\
-	atomic_exchange_explicit(object, desired, memory_order_seq_cst)
-#define	atomic_fetch_add(object, operand)				\
-	atomic_fetch_add_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_and(object, operand)				\
-	atomic_fetch_and_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_or(object, operand)				\
-	atomic_fetch_or_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_sub(object, operand)				\
-	atomic_fetch_sub_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_xor(object, operand)				\
-	atomic_fetch_xor_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_load(object)						\
-	atomic_load_explicit(object, memory_order_seq_cst)
-#define	atomic_store(object, desired)					\
-	atomic_store_explicit(object, desired, memory_order_seq_cst)
-#endif /* !_KERNEL */
-
-/*
- * 7.17.8 Atomic flag type and operations.
- *
- * XXX: Assume atomic_bool can be used as an atomic_flag. Is there some
- * kind of compiler built-in type we could use?
- */
-
-typedef struct {
-	atomic_bool	__flag;
-} atomic_flag;
-
-#define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(false) }
-
-static __inline bool
-atomic_flag_test_and_set_explicit(volatile atomic_flag *__object,
-    memory_order __order)
-{
-	return (atomic_exchange_explicit(&__object->__flag, 1, __order));
-}
-
-static __inline void
-atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order)
-{
-
-	atomic_store_explicit(&__object->__flag, 0, __order);
-}
-
-#ifndef _KERNEL
-static __inline bool
-atomic_flag_test_and_set(volatile atomic_flag *__object)
-{
-
-	return (atomic_flag_test_and_set_explicit(__object,
-	    memory_order_seq_cst));
-}
-
-static __inline void
-atomic_flag_clear(volatile atomic_flag *__object)
-{
-
-	atomic_flag_clear_explicit(__object, memory_order_seq_cst);
-}
-#endif /* !_KERNEL */
-
-#endif /* <atomic> unavailable */
-
-#endif /* !_STDATOMIC_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/stdlib.h b/9/platforms/android-19/arch-mips64/usr/include/stdlib.h
deleted file mode 100644
index a0f017c..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/stdlib.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _STDLIB_H_
-#define _STDLIB_H_
-
-#include <sys/cdefs.h>
-
-#include <stddef.h>
-#include <string.h>
-#include <alloca.h>
-#include <strings.h>
-#include <memory.h>
-
-__BEGIN_DECLS
-
-#define EXIT_FAILURE 1
-#define EXIT_SUCCESS 0
-
-extern __noreturn void abort(void);
-extern __noreturn void exit(int);
-extern __noreturn void _Exit(int);
-extern int atexit(void (*)(void));
-
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-int at_quick_exit(void (*)(void));
-void quick_exit(int) __noreturn;
-#endif
-
-extern char* getenv(const char*);
-extern int putenv(char*);
-extern int setenv(const char*, const char*, int);
-extern int unsetenv(const char*);
-extern int clearenv(void);
-
-extern char* mkdtemp(char*);
-extern char* mktemp(char*) __warnattr("mktemp possibly used unsafely; consider using mkstemp");
-extern int mkstemp(char*);
-extern int mkstemp64(char*);
-
-extern long strtol(const char *, char **, int);
-extern long long strtoll(const char *, char **, int);
-extern unsigned long strtoul(const char *, char **, int);
-extern unsigned long long strtoull(const char *, char **, int);
-
-extern int posix_memalign(void **memptr, size_t alignment, size_t size);
-
-extern double atof(const char*) __NDK_FPABI__;
-
-extern double strtod(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-
-extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-
-extern int atoi(const char*) __purefunc;
-extern long atol(const char*) __purefunc;
-extern long long atoll(const char*) __purefunc;
-
-extern int abs(int) __pure2;
-extern long labs(long) __pure2;
-extern long long llabs(long long) __pure2;
-
-extern char * realpath(const char *path, char *resolved);
-extern int system(const char * string);
-
-extern void * bsearch(const void *key, const void *base0,
-	size_t nmemb, size_t size,
-	int (*compar)(const void *, const void *));
-
-extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
-
-extern long jrand48(unsigned short *);
-extern long mrand48(void);
-extern long nrand48(unsigned short *);
-extern long lrand48(void);
-extern unsigned short *seed48(unsigned short*);
-extern double erand48(unsigned short xsubi[3]) __NDK_FPABI__;
-extern double drand48(void) __NDK_FPABI__;
-extern void srand48(long);
-
-unsigned int arc4random(void);
-unsigned int arc4random_uniform(unsigned int);
-void arc4random_buf(void*, size_t);
-
-#define RAND_MAX 0x7fffffff
-
-int rand(void);
-int rand_r(unsigned int*);
-void srand(unsigned int);
-
-char* initstate(unsigned int, char*, size_t);
-long random(void);
-char* setstate(char*);
-void srandom(unsigned int);
-
-int getpt(void);
-int grantpt(int);
-int posix_openpt(int);
-char* ptsname(int) __warnattr("ptsname is not thread-safe; use ptsname_r instead");
-int ptsname_r(int, char*, size_t);
-int unlockpt(int);
-
-typedef struct {
-    int  quot;
-    int  rem;
-} div_t;
-
-extern div_t   div(int, int) __pure2;
-
-typedef struct {
-    long int  quot;
-    long int  rem;
-} ldiv_t;
-
-extern ldiv_t   ldiv(long, long) __pure2;
-
-typedef struct {
-    long long int  quot;
-    long long int  rem;
-} lldiv_t;
-
-extern lldiv_t   lldiv(long long, long long) __pure2;
-
-/* BSD compatibility. */
-extern const char* getprogname(void);
-extern void setprogname(const char*);
-
-/* make STLPort happy */
-extern int      mblen(const char *, size_t);
-extern size_t   mbstowcs(wchar_t *, const char *, size_t);
-extern int      mbtowc(wchar_t *, const char *, size_t);
-
-/* Likewise, make libstdc++-v3 happy.  */
-extern int	wctomb(char *, wchar_t);
-extern size_t	wcstombs(char *, const wchar_t *, size_t);
-
-extern size_t __ctype_get_mb_cur_max(void);
-#define MB_CUR_MAX __ctype_get_mb_cur_max()
-
-__END_DECLS
-
-#endif /* _STDLIB_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/time.h b/9/platforms/android-19/arch-mips64/usr/include/time.h
deleted file mode 100644
index 0a5f18b..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/time.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _TIME_H_
-#define _TIME_H_
-
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <xlocale.h>
-
-__BEGIN_DECLS
-
-#define CLOCKS_PER_SEC 1000000
-
-extern char* tzname[] __LIBC_ABI_PUBLIC__;
-extern int daylight __LIBC_ABI_PUBLIC__;
-extern long int timezone __LIBC_ABI_PUBLIC__;
-
-struct sigevent;
-
-struct tm {
-  int tm_sec;
-  int tm_min;
-  int tm_hour;
-  int tm_mday;
-  int tm_mon;
-  int tm_year;
-  int tm_wday;
-  int tm_yday;
-  int tm_isdst;
-  long int tm_gmtoff;
-  const char* tm_zone;
-};
-
-#define TM_ZONE tm_zone
-
-extern time_t time(time_t*) __LIBC_ABI_PUBLIC__;
-extern int nanosleep(const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
-
-extern char* asctime(const struct tm*) __LIBC_ABI_PUBLIC__;
-extern char* asctime_r(const struct tm*, char*) __LIBC_ABI_PUBLIC__;
-
-extern double difftime(time_t, time_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern time_t mktime(struct tm*) __LIBC_ABI_PUBLIC__;
-
-extern struct tm* localtime(const time_t*) __LIBC_ABI_PUBLIC__;
-extern struct tm* localtime_r(const time_t*, struct tm*) __LIBC_ABI_PUBLIC__;
-
-extern struct tm* gmtime(const time_t*) __LIBC_ABI_PUBLIC__;
-extern struct tm* gmtime_r(const time_t*, struct tm*) __LIBC_ABI_PUBLIC__;
-
-extern char* strptime(const char*, const char*, struct tm*) __LIBC_ABI_PUBLIC__;
-extern size_t strftime(char*, size_t, const char*, const struct tm*) __LIBC_ABI_PUBLIC__;
-extern size_t strftime_l(char *, size_t, const char *, const struct tm *, locale_t) __LIBC_ABI_PUBLIC__;
-
-extern char* ctime(const time_t*) __LIBC_ABI_PUBLIC__;
-extern char* ctime_r(const time_t*, char*) __LIBC_ABI_PUBLIC__;
-
-extern void tzset(void) __LIBC_ABI_PUBLIC__;
-
-extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
-
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-
-extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
-extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
-extern int timer_settime(timer_t, int, const struct itimerspec*, struct itimerspec*) __LIBC_ABI_PUBLIC__;
-extern int timer_gettime(timer_t, struct itimerspec*) __LIBC_ABI_PUBLIC__;
-extern int timer_getoverrun(timer_t) __LIBC_ABI_PUBLIC__;
-
-/* Non-standard extensions that are in the BSDs and glibc. */
-extern time_t timelocal(struct tm*) __LIBC_ABI_PUBLIC__;
-extern time_t timegm(struct tm*) __LIBC_ABI_PUBLIC__;
-
-__END_DECLS
-
-#endif /* _TIME_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/wchar.h b/9/platforms/android-19/arch-mips64/usr/include/wchar.h
deleted file mode 100644
index f421d4c..0000000
--- a/9/platforms/android-19/arch-mips64/usr/include/wchar.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _WCHAR_H_
-#define _WCHAR_H_
-
-#include <sys/cdefs.h>
-#include <stdio.h>
-
-#include <stdarg.h>
-#include <stddef.h>
-#include <time.h>
-
-#include <machine/wchar_limits.h>
-
-__BEGIN_DECLS
-
-typedef __WINT_TYPE__  wint_t;
-typedef struct {
-  uint8_t __seq[4];
-#ifdef __LP64__
-  char __reserved[4];
-#endif
-} mbstate_t;
-
-enum {
-    WC_TYPE_INVALID = 0,
-    WC_TYPE_ALNUM,
-    WC_TYPE_ALPHA,
-    WC_TYPE_BLANK,
-    WC_TYPE_CNTRL,
-    WC_TYPE_DIGIT,
-    WC_TYPE_GRAPH,
-    WC_TYPE_LOWER,
-    WC_TYPE_PRINT,
-    WC_TYPE_PUNCT,
-    WC_TYPE_SPACE,
-    WC_TYPE_UPPER,
-    WC_TYPE_XDIGIT,
-    WC_TYPE_MAX
-};
-
-typedef long wctype_t;
-
-#define  WEOF        ((wint_t)(-1))
-
-extern wint_t            btowc(int);
-extern int               fwprintf(FILE *, const wchar_t *, ...);
-extern int               fwscanf(FILE *, const wchar_t *, ...);
-extern int               iswalnum(wint_t);
-extern int               iswalpha(wint_t);
-extern int               iswblank(wint_t);
-extern int               iswcntrl(wint_t);
-extern int               iswdigit(wint_t);
-extern int               iswgraph(wint_t);
-extern int               iswlower(wint_t);
-extern int               iswprint(wint_t);
-extern int               iswpunct(wint_t);
-extern int               iswspace(wint_t);
-extern int               iswupper(wint_t);
-extern int               iswxdigit(wint_t);
-extern int               iswctype(wint_t, wctype_t);
-extern wint_t            fgetwc(FILE *);
-extern wchar_t          *fgetws(wchar_t *, int, FILE *);
-extern wint_t            fputwc(wchar_t, FILE *);
-extern int               fputws(const wchar_t *, FILE *);
-extern int               fwide(FILE *, int);
-extern wint_t            getwc(FILE *);
-extern wint_t            getwchar(void);
-extern int               mbsinit(const mbstate_t *);
-extern size_t            mbrlen(const char *, size_t, mbstate_t *);
-extern size_t            mbrtowc(wchar_t *, const char *, size_t, mbstate_t *);
-extern size_t mbsrtowcs(wchar_t*, const char**, size_t, mbstate_t*);
-extern size_t mbsnrtowcs(wchar_t*, const char**, size_t, size_t, mbstate_t*);
-extern size_t            mbstowcs(wchar_t *, const char *, size_t);
-extern wint_t            putwc(wchar_t, FILE *);
-extern wint_t            putwchar(wchar_t);
-extern int               swprintf(wchar_t *, size_t, const wchar_t *, ...);
-extern int               swscanf(const wchar_t *, const wchar_t *, ...);
-extern wint_t            towlower(wint_t);
-extern wint_t            towupper(wint_t);
-extern wint_t            ungetwc(wint_t, FILE *);
-extern int vfwprintf(FILE*, const wchar_t*, va_list);
-extern int vfwscanf(FILE*, const wchar_t*, va_list);
-extern int vswprintf(wchar_t*, size_t, const wchar_t*, va_list);
-extern int vswscanf(const wchar_t*, const wchar_t*, va_list);
-extern int vwprintf(const wchar_t*, va_list);
-extern int vwscanf(const wchar_t*, va_list);
-extern size_t            wcrtomb(char *, wchar_t, mbstate_t *);
-extern int               wcscasecmp(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcscat(wchar_t *, const wchar_t *);
-extern wchar_t          *wcschr(const wchar_t *, wchar_t);
-extern int               wcscmp(const wchar_t *, const wchar_t *);
-extern int               wcscoll(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcscpy(wchar_t *, const wchar_t *);
-extern size_t            wcscspn(const wchar_t *, const wchar_t *);
-extern size_t            wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *) __LIBC_ABI_PUBLIC__;
-extern size_t            wcslen(const wchar_t *);
-extern int               wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wcsncat(wchar_t *, const wchar_t *, size_t);
-extern int               wcsncmp(const wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wcsncpy(wchar_t *, const wchar_t *, size_t);
-extern size_t wcsnrtombs(char*, const wchar_t**, size_t, size_t, mbstate_t*);
-extern wchar_t          *wcspbrk(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcsrchr(const wchar_t *, wchar_t);
-extern size_t wcsrtombs(char*, const wchar_t**, size_t, mbstate_t*);
-extern size_t            wcsspn(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcsstr(const wchar_t *, const wchar_t *);
-extern double wcstod(const wchar_t*, wchar_t**) __NDK_FPABI__;
-extern float wcstof(const wchar_t*, wchar_t**) __NDK_FPABI__;
-extern wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**);
-extern long wcstol(const wchar_t*, wchar_t**, int);
-extern long long wcstoll(const wchar_t*, wchar_t**, int);
-extern long double wcstold(const wchar_t*, wchar_t**) __NDK_FPABI__;
-extern unsigned long wcstoul(const wchar_t*, wchar_t**, int);
-extern unsigned long long wcstoull(const wchar_t*, wchar_t**, int);
-extern int               wcswidth(const wchar_t *, size_t);
-extern size_t            wcsxfrm(wchar_t *, const wchar_t *, size_t);
-extern int               wctob(wint_t);
-extern wctype_t          wctype(const char *);
-extern int               wcwidth(wchar_t);
-extern wchar_t          *wmemchr(const wchar_t *, wchar_t, size_t);
-extern int               wmemcmp(const wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wmemcpy(wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wmemmove(wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wmemset(wchar_t *, wchar_t, size_t);
-extern int               wprintf(const wchar_t *, ...);
-extern int               wscanf(const wchar_t *, ...);
-
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
-
-extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
-extern size_t wcsxfrm_l(wchar_t *, const wchar_t *, size_t, locale_t);
-
-extern size_t wcslcat(wchar_t*, const wchar_t*, size_t);
-extern size_t wcslcpy(wchar_t*, const wchar_t*, size_t);
-
-typedef void *wctrans_t;
-extern wint_t towctrans(wint_t, wctrans_t);
-extern wctrans_t wctrans(const char*);
-
-#if __POSIX_VISIBLE >= 200809
-wchar_t* wcsdup(const wchar_t*);
-size_t wcsnlen(const wchar_t*, size_t);
-#endif
-
-__END_DECLS
-
-#endif /* _WCHAR_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_dynamic.o b/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_dynamic.o
deleted file mode 100644
index a82686b..0000000
--- a/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_dynamic.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_so.o b/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_so.o
deleted file mode 100644
index 8a25be8..0000000
--- a/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_so.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_static.o b/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_static.o
deleted file mode 100644
index a82686b..0000000
--- a/9/platforms/android-19/arch-mips64/usr/lib64/crtbegin_static.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libc.so b/9/platforms/android-19/arch-mips64/usr/lib64/libc.so
deleted file mode 100755
index ede30da..0000000
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libc.so
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64 b/9/platforms/android-19/arch-x86_64
new file mode 120000
index 0000000..8e01f87
--- /dev/null
+++ b/9/platforms/android-19/arch-x86_64
@@ -0,0 +1 @@
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/api-level.h b/9/platforms/android-19/arch-x86_64/usr/include/android/api-level.h
deleted file mode 100644
index 9e9c3d6..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/android/api-level.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef ANDROID_API_LEVEL_H
-#define ANDROID_API_LEVEL_H
-
-#define __ANDROID_API__ 19
-
-#endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/input.h b/9/platforms/android-19/arch-x86_64/usr/include/linux/input.h
deleted file mode 100644
index df3200c..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/linux/input.h
+++ /dev/null
@@ -1,1045 +0,0 @@
-/****************************************************************************
- ****************************************************************************
- ***
- ***   This header was automatically generated from a Linux kernel header
- ***   of the same name, to make information necessary for userspace to
- ***   call into the kernel available to libc.  It contains only constants,
- ***   structures, and macros generated from the original header, and thus,
- ***   contains no copyrightable information.
- ***
- ***   To edit the content of this header, modify the corresponding
- ***   source file (e.g. under external/kernel-headers/original/) then
- ***   run bionic/libc/kernel/tools/update_all.py
- ***
- ***   Any manual change here will be lost the next time this script will
- ***   be run. You've been warned!
- ***
- ****************************************************************************
- ****************************************************************************/
-#ifndef _UAPI_INPUT_H
-#define _UAPI_INPUT_H
-#include <sys/time.h>
-#include <sys/ioctl.h>
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#include <sys/types.h>
-#include <linux/types.h>
-struct input_event {
- struct timeval time;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 type;
- __u16 code;
- __s32 value;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_VERSION 0x010001
-struct input_id {
- __u16 bustype;
- __u16 vendor;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 product;
- __u16 version;
-};
-struct input_absinfo {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __s32 value;
- __s32 minimum;
- __s32 maximum;
- __s32 fuzz;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __s32 flat;
- __s32 resolution;
-};
-struct input_keymap_entry {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define INPUT_KEYMAP_BY_INDEX (1 << 0)
- __u8 flags;
- __u8 len;
- __u16 index;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u32 keycode;
- __u8 scancode[32];
-};
-#define EVIOCGVERSION _IOR('E', 0x01, int)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGID _IOR('E', 0x02, struct input_id)
-#define EVIOCGREP _IOR('E', 0x03, unsigned int[2])
-#define EVIOCSREP _IOW('E', 0x03, unsigned int[2])
-#define EVIOCGKEYCODE _IOR('E', 0x04, unsigned int[2])
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry)
-#define EVIOCSKEYCODE _IOW('E', 0x04, unsigned int[2])
-#define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry)
-#define EVIOCGNAME(len) _IOC(_IOC_READ, 'E', 0x06, len)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGPHYS(len) _IOC(_IOC_READ, 'E', 0x07, len)
-#define EVIOCGUNIQ(len) _IOC(_IOC_READ, 'E', 0x08, len)
-#define EVIOCGPROP(len) _IOC(_IOC_READ, 'E', 0x09, len)
-#define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len)
-#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len)
-#define EVIOCGSND(len) _IOC(_IOC_READ, 'E', 0x1a, len)
-#define EVIOCGSW(len) _IOC(_IOC_READ, 'E', 0x1b, len)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCGBIT(ev,len) _IOC(_IOC_READ, 'E', 0x20 + (ev), len)
-#define EVIOCGABS(abs) _IOR('E', 0x40 + (abs), struct input_absinfo)
-#define EVIOCSABS(abs) _IOW('E', 0xc0 + (abs), struct input_absinfo)
-#define EVIOCSFF _IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCRMFF _IOW('E', 0x81, int)
-#define EVIOCGEFFECTS _IOR('E', 0x84, int)
-#define EVIOCGRAB _IOW('E', 0x90, int)
-#define EVIOCREVOKE _IOW('E', 0x91, int)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EVIOCSCLOCKID _IOW('E', 0xa0, int)
-#define INPUT_PROP_POINTER 0x00
-#define INPUT_PROP_DIRECT 0x01
-#define INPUT_PROP_BUTTONPAD 0x02
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define INPUT_PROP_SEMI_MT 0x03
-#define INPUT_PROP_MAX 0x1f
-#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_KEY 0x01
-#define EV_REL 0x02
-#define EV_ABS 0x03
-#define EV_MSC 0x04
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_SW 0x05
-#define EV_LED 0x11
-#define EV_SND 0x12
-#define EV_REP 0x14
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_FF 0x15
-#define EV_PWR 0x16
-#define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define EV_CNT (EV_MAX+1)
-#define SYN_REPORT 0
-#define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SYN_DROPPED 3
-#define SYN_MAX 0xf
-#define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_ESC 1
-#define KEY_1 2
-#define KEY_2 3
-#define KEY_3 4
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_4 5
-#define KEY_5 6
-#define KEY_6 7
-#define KEY_7 8
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_8 9
-#define KEY_9 10
-#define KEY_0 11
-#define KEY_MINUS 12
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_EQUAL 13
-#define KEY_BACKSPACE 14
-#define KEY_TAB 15
-#define KEY_Q 16
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_W 17
-#define KEY_E 18
-#define KEY_R 19
-#define KEY_T 20
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_Y 21
-#define KEY_U 22
-#define KEY_I 23
-#define KEY_O 24
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_P 25
-#define KEY_LEFTBRACE 26
-#define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_LEFTCTRL 29
-#define KEY_A 30
-#define KEY_S 31
-#define KEY_D 32
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F 33
-#define KEY_G 34
-#define KEY_H 35
-#define KEY_J 36
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_K 37
-#define KEY_L 38
-#define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_GRAVE 41
-#define KEY_LEFTSHIFT 42
-#define KEY_BACKSLASH 43
-#define KEY_Z 44
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_X 45
-#define KEY_C 46
-#define KEY_V 47
-#define KEY_B 48
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_N 49
-#define KEY_M 50
-#define KEY_COMMA 51
-#define KEY_DOT 52
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SLASH 53
-#define KEY_RIGHTSHIFT 54
-#define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SPACE 57
-#define KEY_CAPSLOCK 58
-#define KEY_F1 59
-#define KEY_F2 60
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F3 61
-#define KEY_F4 62
-#define KEY_F5 63
-#define KEY_F6 64
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F7 65
-#define KEY_F8 66
-#define KEY_F9 67
-#define KEY_F10 68
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMLOCK 69
-#define KEY_SCROLLLOCK 70
-#define KEY_KP7 71
-#define KEY_KP8 72
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KP9 73
-#define KEY_KPMINUS 74
-#define KEY_KP4 75
-#define KEY_KP5 76
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KP6 77
-#define KEY_KPPLUS 78
-#define KEY_KP1 79
-#define KEY_KP2 80
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KP3 81
-#define KEY_KP0 82
-#define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_102ND 86
-#define KEY_F11 87
-#define KEY_F12 88
-#define KEY_RO 89
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KATAKANA 90
-#define KEY_HIRAGANA 91
-#define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_MUHENKAN 94
-#define KEY_KPJPCOMMA 95
-#define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KPSLASH 98
-#define KEY_SYSRQ 99
-#define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_HOME 102
-#define KEY_UP 103
-#define KEY_PAGEUP 104
-#define KEY_LEFT 105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_RIGHT 106
-#define KEY_END 107
-#define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_INSERT 110
-#define KEY_DELETE 111
-#define KEY_MACRO 112
-#define KEY_MUTE 113
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_VOLUMEDOWN 114
-#define KEY_VOLUMEUP 115
-#define KEY_POWER 116
-#define KEY_KPEQUAL 117
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KPPLUSMINUS 118
-#define KEY_PAUSE 119
-#define KEY_SCALE 120
-#define KEY_KPCOMMA 121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_HANGEUL 122
-#define KEY_HANGUEL KEY_HANGEUL
-#define KEY_HANJA 123
-#define KEY_YEN 124
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_LEFTMETA 125
-#define KEY_RIGHTMETA 126
-#define KEY_COMPOSE 127
-#define KEY_STOP 128
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_AGAIN 129
-#define KEY_PROPS 130
-#define KEY_UNDO 131
-#define KEY_FRONT 132
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_COPY 133
-#define KEY_OPEN 134
-#define KEY_PASTE 135
-#define KEY_FIND 136
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CUT 137
-#define KEY_HELP 138
-#define KEY_MENU 139
-#define KEY_CALC 140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SETUP 141
-#define KEY_SLEEP 142
-#define KEY_WAKEUP 143
-#define KEY_FILE 144
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SENDFILE 145
-#define KEY_DELETEFILE 146
-#define KEY_XFER 147
-#define KEY_PROG1 148
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PROG2 149
-#define KEY_WWW 150
-#define KEY_MSDOS 151
-#define KEY_COFFEE 152
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SCREENLOCK KEY_COFFEE
-#define KEY_DIRECTION 153
-#define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BOOKMARKS 156
-#define KEY_COMPUTER 157
-#define KEY_BACK 158
-#define KEY_FORWARD 159
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CLOSECD 160
-#define KEY_EJECTCD 161
-#define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PLAYPAUSE 164
-#define KEY_PREVIOUSSONG 165
-#define KEY_STOPCD 166
-#define KEY_RECORD 167
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_REWIND 168
-#define KEY_PHONE 169
-#define KEY_ISO 170
-#define KEY_CONFIG 171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_HOMEPAGE 172
-#define KEY_REFRESH 173
-#define KEY_EXIT 174
-#define KEY_MOVE 175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_EDIT 176
-#define KEY_SCROLLUP 177
-#define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KPRIGHTPAREN 180
-#define KEY_NEW 181
-#define KEY_REDO 182
-#define KEY_F13 183
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F14 184
-#define KEY_F15 185
-#define KEY_F16 186
-#define KEY_F17 187
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F18 188
-#define KEY_F19 189
-#define KEY_F20 190
-#define KEY_F21 191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_F22 192
-#define KEY_F23 193
-#define KEY_F24 194
-#define KEY_PLAYCD 200
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PAUSECD 201
-#define KEY_PROG3 202
-#define KEY_PROG4 203
-#define KEY_DASHBOARD 204
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SUSPEND 205
-#define KEY_CLOSE 206
-#define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BASSBOOST 209
-#define KEY_PRINT 210
-#define KEY_HP 211
-#define KEY_CAMERA 212
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SOUND 213
-#define KEY_QUESTION 214
-#define KEY_EMAIL 215
-#define KEY_CHAT 216
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SEARCH 217
-#define KEY_CONNECT 218
-#define KEY_FINANCE 219
-#define KEY_SPORT 220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SHOP 221
-#define KEY_ALTERASE 222
-#define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BRIGHTNESSUP 225
-#define KEY_MEDIA 226
-#define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KBDILLUMDOWN 229
-#define KEY_KBDILLUMUP 230
-#define KEY_SEND 231
-#define KEY_REPLY 232
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FORWARDMAIL 233
-#define KEY_SAVE 234
-#define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BLUETOOTH 237
-#define KEY_WLAN 238
-#define KEY_UWB 239
-#define KEY_UNKNOWN 240
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_VIDEO_NEXT 241
-#define KEY_VIDEO_PREV 242
-#define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DISPLAY_OFF 245
-#define KEY_WWAN 246
-#define KEY_WIMAX KEY_WWAN
-#define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_MICMUTE 248
-#define BTN_MISC 0x100
-#define BTN_0 0x100
-#define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_2 0x102
-#define BTN_3 0x103
-#define BTN_4 0x104
-#define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_6 0x106
-#define BTN_7 0x107
-#define BTN_8 0x108
-#define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_MOUSE 0x110
-#define BTN_LEFT 0x110
-#define BTN_RIGHT 0x111
-#define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_SIDE 0x113
-#define BTN_EXTRA 0x114
-#define BTN_FORWARD 0x115
-#define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TASK 0x117
-#define BTN_JOYSTICK 0x120
-#define BTN_TRIGGER 0x120
-#define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_THUMB2 0x122
-#define BTN_TOP 0x123
-#define BTN_TOP2 0x124
-#define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_BASE 0x126
-#define BTN_BASE2 0x127
-#define BTN_BASE3 0x128
-#define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_BASE5 0x12a
-#define BTN_BASE6 0x12b
-#define BTN_DEAD 0x12f
-#define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_SOUTH 0x130
-#define BTN_A BTN_SOUTH
-#define BTN_EAST 0x131
-#define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_C 0x132
-#define BTN_NORTH 0x133
-#define BTN_X BTN_NORTH
-#define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_Y BTN_WEST
-#define BTN_Z 0x135
-#define BTN_TL 0x136
-#define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TL2 0x138
-#define BTN_TR2 0x139
-#define BTN_SELECT 0x13a
-#define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_MODE 0x13c
-#define BTN_THUMBL 0x13d
-#define BTN_THUMBR 0x13e
-#define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_PEN 0x140
-#define BTN_TOOL_RUBBER 0x141
-#define BTN_TOOL_BRUSH 0x142
-#define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_AIRBRUSH 0x144
-#define BTN_TOOL_FINGER 0x145
-#define BTN_TOOL_MOUSE 0x146
-#define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_QUINTTAP 0x148
-#define BTN_TOUCH 0x14a
-#define BTN_STYLUS 0x14b
-#define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TOOL_DOUBLETAP 0x14d
-#define BTN_TOOL_TRIPLETAP 0x14e
-#define BTN_TOOL_QUADTAP 0x14f
-#define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_GEAR_DOWN 0x150
-#define BTN_GEAR_UP 0x151
-#define KEY_OK 0x160
-#define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_GOTO 0x162
-#define KEY_CLEAR 0x163
-#define KEY_POWER2 0x164
-#define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_INFO 0x166
-#define KEY_TIME 0x167
-#define KEY_VENDOR 0x168
-#define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PROGRAM 0x16a
-#define KEY_CHANNEL 0x16b
-#define KEY_FAVORITES 0x16c
-#define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_PVR 0x16e
-#define KEY_MHP 0x16f
-#define KEY_LANGUAGE 0x170
-#define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SUBTITLE 0x172
-#define KEY_ANGLE 0x173
-#define KEY_ZOOM 0x174
-#define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_KEYBOARD 0x176
-#define KEY_SCREEN 0x177
-#define KEY_PC 0x178
-#define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TV2 0x17a
-#define KEY_VCR 0x17b
-#define KEY_VCR2 0x17c
-#define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SAT2 0x17e
-#define KEY_CD 0x17f
-#define KEY_TAPE 0x180
-#define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TUNER 0x182
-#define KEY_PLAYER 0x183
-#define KEY_TEXT 0x184
-#define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_AUX 0x186
-#define KEY_MP3 0x187
-#define KEY_AUDIO 0x188
-#define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DIRECTORY 0x18a
-#define KEY_LIST 0x18b
-#define KEY_MEMO 0x18c
-#define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_RED 0x18e
-#define KEY_GREEN 0x18f
-#define KEY_YELLOW 0x190
-#define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CHANNELUP 0x192
-#define KEY_CHANNELDOWN 0x193
-#define KEY_FIRST 0x194
-#define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_AB 0x196
-#define KEY_NEXT 0x197
-#define KEY_RESTART 0x198
-#define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_SHUFFLE 0x19a
-#define KEY_BREAK 0x19b
-#define KEY_PREVIOUS 0x19c
-#define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TEEN 0x19e
-#define KEY_TWEN 0x19f
-#define KEY_VIDEOPHONE 0x1a0
-#define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_ZOOMIN 0x1a2
-#define KEY_ZOOMOUT 0x1a3
-#define KEY_ZOOMRESET 0x1a4
-#define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_EDITOR 0x1a6
-#define KEY_SPREADSHEET 0x1a7
-#define KEY_GRAPHICSEDITOR 0x1a8
-#define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DATABASE 0x1aa
-#define KEY_NEWS 0x1ab
-#define KEY_VOICEMAIL 0x1ac
-#define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_MESSENGER 0x1ae
-#define KEY_DISPLAYTOGGLE 0x1af
-#define KEY_SPELLCHECK 0x1b0
-#define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DOLLAR 0x1b2
-#define KEY_EURO 0x1b3
-#define KEY_FRAMEBACK 0x1b4
-#define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CONTEXT_MENU 0x1b6
-#define KEY_MEDIA_REPEAT 0x1b7
-#define KEY_10CHANNELSUP 0x1b8
-#define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_IMAGES 0x1ba
-#define KEY_DEL_EOL 0x1c0
-#define KEY_DEL_EOS 0x1c1
-#define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_DEL_LINE 0x1c3
-#define KEY_FN 0x1d0
-#define KEY_FN_ESC 0x1d1
-#define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_F2 0x1d3
-#define KEY_FN_F3 0x1d4
-#define KEY_FN_F4 0x1d5
-#define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_F6 0x1d7
-#define KEY_FN_F7 0x1d8
-#define KEY_FN_F8 0x1d9
-#define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_F10 0x1db
-#define KEY_FN_F11 0x1dc
-#define KEY_FN_F12 0x1dd
-#define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_2 0x1df
-#define KEY_FN_D 0x1e0
-#define KEY_FN_E 0x1e1
-#define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_FN_S 0x1e3
-#define KEY_FN_B 0x1e4
-#define KEY_BRL_DOT1 0x1f1
-#define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BRL_DOT3 0x1f3
-#define KEY_BRL_DOT4 0x1f4
-#define KEY_BRL_DOT5 0x1f5
-#define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_BRL_DOT7 0x1f7
-#define KEY_BRL_DOT8 0x1f8
-#define KEY_BRL_DOT9 0x1f9
-#define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMERIC_0 0x200
-#define KEY_NUMERIC_1 0x201
-#define KEY_NUMERIC_2 0x202
-#define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMERIC_4 0x204
-#define KEY_NUMERIC_5 0x205
-#define KEY_NUMERIC_6 0x206
-#define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_NUMERIC_8 0x208
-#define KEY_NUMERIC_9 0x209
-#define KEY_NUMERIC_STAR 0x20a
-#define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CAMERA_FOCUS 0x210
-#define KEY_WPS_BUTTON 0x211
-#define KEY_TOUCHPAD_TOGGLE 0x212
-#define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_TOUCHPAD_OFF 0x214
-#define KEY_CAMERA_ZOOMIN 0x215
-#define KEY_CAMERA_ZOOMOUT 0x216
-#define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_CAMERA_DOWN 0x218
-#define KEY_CAMERA_LEFT 0x219
-#define KEY_CAMERA_RIGHT 0x21a
-#define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define KEY_ATTENDANT_OFF 0x21c
-#define KEY_ATTENDANT_TOGGLE 0x21d
-#define KEY_LIGHTS_TOGGLE 0x21e
-#define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_DPAD_DOWN 0x221
-#define BTN_DPAD_LEFT 0x222
-#define BTN_DPAD_RIGHT 0x223
-#define KEY_ALS_TOGGLE 0x230
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY 0x2c0
-#define BTN_TRIGGER_HAPPY1 0x2c0
-#define BTN_TRIGGER_HAPPY2 0x2c1
-#define BTN_TRIGGER_HAPPY3 0x2c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY4 0x2c3
-#define BTN_TRIGGER_HAPPY5 0x2c4
-#define BTN_TRIGGER_HAPPY6 0x2c5
-#define BTN_TRIGGER_HAPPY7 0x2c6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY8 0x2c7
-#define BTN_TRIGGER_HAPPY9 0x2c8
-#define BTN_TRIGGER_HAPPY10 0x2c9
-#define BTN_TRIGGER_HAPPY11 0x2ca
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY12 0x2cb
-#define BTN_TRIGGER_HAPPY13 0x2cc
-#define BTN_TRIGGER_HAPPY14 0x2cd
-#define BTN_TRIGGER_HAPPY15 0x2ce
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY16 0x2cf
-#define BTN_TRIGGER_HAPPY17 0x2d0
-#define BTN_TRIGGER_HAPPY18 0x2d1
-#define BTN_TRIGGER_HAPPY19 0x2d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY20 0x2d3
-#define BTN_TRIGGER_HAPPY21 0x2d4
-#define BTN_TRIGGER_HAPPY22 0x2d5
-#define BTN_TRIGGER_HAPPY23 0x2d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY24 0x2d7
-#define BTN_TRIGGER_HAPPY25 0x2d8
-#define BTN_TRIGGER_HAPPY26 0x2d9
-#define BTN_TRIGGER_HAPPY27 0x2da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY28 0x2db
-#define BTN_TRIGGER_HAPPY29 0x2dc
-#define BTN_TRIGGER_HAPPY30 0x2dd
-#define BTN_TRIGGER_HAPPY31 0x2de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY32 0x2df
-#define BTN_TRIGGER_HAPPY33 0x2e0
-#define BTN_TRIGGER_HAPPY34 0x2e1
-#define BTN_TRIGGER_HAPPY35 0x2e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY36 0x2e3
-#define BTN_TRIGGER_HAPPY37 0x2e4
-#define BTN_TRIGGER_HAPPY38 0x2e5
-#define BTN_TRIGGER_HAPPY39 0x2e6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BTN_TRIGGER_HAPPY40 0x2e7
-#define KEY_MIN_INTERESTING KEY_MUTE
-#define KEY_MAX 0x2ff
-#define KEY_CNT (KEY_MAX+1)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REL_X 0x00
-#define REL_Y 0x01
-#define REL_Z 0x02
-#define REL_RX 0x03
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REL_RY 0x04
-#define REL_RZ 0x05
-#define REL_HWHEEL 0x06
-#define REL_DIAL 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REL_WHEEL 0x08
-#define REL_MISC 0x09
-#define REL_MAX 0x0f
-#define REL_CNT (REL_MAX+1)
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_X 0x00
-#define ABS_Y 0x01
-#define ABS_Z 0x02
-#define ABS_RX 0x03
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_RY 0x04
-#define ABS_RZ 0x05
-#define ABS_THROTTLE 0x06
-#define ABS_RUDDER 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_WHEEL 0x08
-#define ABS_GAS 0x09
-#define ABS_BRAKE 0x0a
-#define ABS_HAT0X 0x10
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_HAT0Y 0x11
-#define ABS_HAT1X 0x12
-#define ABS_HAT1Y 0x13
-#define ABS_HAT2X 0x14
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_HAT2Y 0x15
-#define ABS_HAT3X 0x16
-#define ABS_HAT3Y 0x17
-#define ABS_PRESSURE 0x18
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_DISTANCE 0x19
-#define ABS_TILT_X 0x1a
-#define ABS_TILT_Y 0x1b
-#define ABS_TOOL_WIDTH 0x1c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_VOLUME 0x20
-#define ABS_MISC 0x28
-#define ABS_MT_SLOT 0x2f
-#define ABS_MT_TOUCH_MAJOR 0x30
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_TOUCH_MINOR 0x31
-#define ABS_MT_WIDTH_MAJOR 0x32
-#define ABS_MT_WIDTH_MINOR 0x33
-#define ABS_MT_ORIENTATION 0x34
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_POSITION_X 0x35
-#define ABS_MT_POSITION_Y 0x36
-#define ABS_MT_TOOL_TYPE 0x37
-#define ABS_MT_BLOB_ID 0x38
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_TRACKING_ID 0x39
-#define ABS_MT_PRESSURE 0x3a
-#define ABS_MT_DISTANCE 0x3b
-#define ABS_MT_TOOL_X 0x3c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ABS_MT_TOOL_Y 0x3d
-#define ABS_MAX 0x3f
-#define ABS_CNT (ABS_MAX+1)
-#define SW_LID 0x00
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_TABLET_MODE 0x01
-#define SW_HEADPHONE_INSERT 0x02
-#define SW_RFKILL_ALL 0x03
-#define SW_RADIO SW_RFKILL_ALL
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_MICROPHONE_INSERT 0x04
-#define SW_DOCK 0x05
-#define SW_LINEOUT_INSERT 0x06
-#define SW_JACK_PHYSICAL_INSERT 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_VIDEOOUT_INSERT 0x08
-#define SW_CAMERA_LENS_COVER 0x09
-#define SW_KEYPAD_SLIDE 0x0a
-#define SW_FRONT_PROXIMITY 0x0b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_ROTATE_LOCK 0x0c
-#define SW_LINEIN_INSERT 0x0d
-#define SW_MUTE_DEVICE 0x0e
-#define SW_MAX 0x0f
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SW_CNT (SW_MAX+1)
-#define MSC_SERIAL 0x00
-#define MSC_PULSELED 0x01
-#define MSC_GESTURE 0x02
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSC_RAW 0x03
-#define MSC_SCAN 0x04
-#define MSC_TIMESTAMP 0x05
-#define MSC_MAX 0x07
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MSC_CNT (MSC_MAX+1)
-#define LED_NUML 0x00
-#define LED_CAPSL 0x01
-#define LED_SCROLLL 0x02
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define LED_COMPOSE 0x03
-#define LED_KANA 0x04
-#define LED_SLEEP 0x05
-#define LED_SUSPEND 0x06
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define LED_MUTE 0x07
-#define LED_MISC 0x08
-#define LED_MAIL 0x09
-#define LED_CHARGING 0x0a
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define LED_MAX 0x0f
-#define LED_CNT (LED_MAX+1)
-#define REP_DELAY 0x00
-#define REP_PERIOD 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define REP_MAX 0x01
-#define REP_CNT (REP_MAX+1)
-#define SND_CLICK 0x00
-#define SND_BELL 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define SND_TONE 0x02
-#define SND_MAX 0x07
-#define SND_CNT (SND_MAX+1)
-#define ID_BUS 0
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ID_VENDOR 1
-#define ID_PRODUCT 2
-#define ID_VERSION 3
-#define BUS_PCI 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_ISAPNP 0x02
-#define BUS_USB 0x03
-#define BUS_HIL 0x04
-#define BUS_BLUETOOTH 0x05
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_VIRTUAL 0x06
-#define BUS_ISA 0x10
-#define BUS_I8042 0x11
-#define BUS_XTKBD 0x12
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_RS232 0x13
-#define BUS_GAMEPORT 0x14
-#define BUS_PARPORT 0x15
-#define BUS_AMIGA 0x16
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_ADB 0x17
-#define BUS_I2C 0x18
-#define BUS_HOST 0x19
-#define BUS_GSC 0x1A
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define BUS_ATARI 0x1B
-#define BUS_SPI 0x1C
-#define MT_TOOL_FINGER 0
-#define MT_TOOL_PEN 1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define MT_TOOL_MAX 1
-#define FF_STATUS_STOPPED 0x00
-#define FF_STATUS_PLAYING 0x01
-#define FF_STATUS_MAX 0x01
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct ff_replay {
- __u16 length;
- __u16 delay;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct ff_trigger {
- __u16 button;
- __u16 interval;
-};
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-struct ff_envelope {
- __u16 attack_length;
- __u16 attack_level;
- __u16 fade_length;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 fade_level;
-};
-struct ff_constant_effect {
- __s16 level;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ff_envelope envelope;
-};
-struct ff_ramp_effect {
- __s16 start_level;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __s16 end_level;
- struct ff_envelope envelope;
-};
-struct ff_condition_effect {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 right_saturation;
- __u16 left_saturation;
- __s16 right_coeff;
- __s16 left_coeff;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 deadband;
- __s16 center;
-};
-struct ff_periodic_effect {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 waveform;
- __u16 period;
- __s16 magnitude;
- __s16 offset;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 phase;
- struct ff_envelope envelope;
- __u32 custom_len;
- __s16 __user *custom_data;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct ff_rumble_effect {
- __u16 strong_magnitude;
- __u16 weak_magnitude;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-};
-struct ff_effect {
- __u16 type;
- __s16 id;
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- __u16 direction;
- struct ff_trigger trigger;
- struct ff_replay replay;
- union {
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ff_constant_effect constant;
- struct ff_ramp_effect ramp;
- struct ff_periodic_effect periodic;
- struct ff_condition_effect condition[2];
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ff_rumble_effect rumble;
- } u;
-};
-#define FF_RUMBLE 0x50
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_PERIODIC 0x51
-#define FF_CONSTANT 0x52
-#define FF_SPRING 0x53
-#define FF_FRICTION 0x54
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_DAMPER 0x55
-#define FF_INERTIA 0x56
-#define FF_RAMP 0x57
-#define FF_EFFECT_MIN FF_RUMBLE
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_EFFECT_MAX FF_RAMP
-#define FF_SQUARE 0x58
-#define FF_TRIANGLE 0x59
-#define FF_SINE 0x5a
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_SAW_UP 0x5b
-#define FF_SAW_DOWN 0x5c
-#define FF_CUSTOM 0x5d
-#define FF_WAVEFORM_MIN FF_SQUARE
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_WAVEFORM_MAX FF_CUSTOM
-#define FF_GAIN 0x60
-#define FF_AUTOCENTER 0x61
-#define FF_MAX 0x7f
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define FF_CNT (FF_MAX+1)
-#endif
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/malloc.h b/9/platforms/android-19/arch-x86_64/usr/include/malloc.h
deleted file mode 100644
index 1e92b7d..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/malloc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef LIBC_INCLUDE_MALLOC_H_
-#define LIBC_INCLUDE_MALLOC_H_
-
-/*
- * Declaration of malloc routines. Bionic uses dlmalloc (see
- * upstream-dlmalloc) but doesn't directly include it here to keep the
- * defined malloc.h interface small.
- */
-#include <sys/cdefs.h>
-#include <stddef.h>
-
-__BEGIN_DECLS
-
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
-extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
-extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
-extern void free(void* p);
-extern size_t malloc_usable_size(const void* p);
-
-#ifndef STRUCT_MALLINFO_DECLARED
-#define STRUCT_MALLINFO_DECLARED 1
-struct mallinfo {
-  size_t arena;    /* Total number of non-mmapped bytes currently allocated from OS. */
-  size_t ordblks;  /* Number of free chunks. */
-  size_t smblks;   /* (Unused.) */
-  size_t hblks;    /* (Unused.) */
-  size_t hblkhd;   /* Total number of bytes in mmapped regions. */
-  size_t usmblks;  /* Maximum total allocated space; greater than total if trimming has occurred. */
-  size_t fsmblks;  /* (Unused.) */
-  size_t uordblks; /* Total allocated space (normal or mmapped.) */
-  size_t fordblks; /* Total free space. */
-  size_t keepcost; /* Upper bound on number of bytes releasable by malloc_trim. */
-};
-#endif  /* STRUCT_MALLINFO_DECLARED */
-
-extern struct mallinfo mallinfo(void);
-
-__END_DECLS
-
-#endif  /* LIBC_INCLUDE_MALLOC_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/math.h b/9/platforms/android-19/arch-x86_64/usr/include/math.h
deleted file mode 100644
index 8369d6e..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/math.h
+++ /dev/null
@@ -1,759 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/*
- * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
- */
-
-#ifndef _MATH_H_
-#define	_MATH_H_
-
-#include <sys/cdefs.h>
-#include <limits.h>
-
-__BEGIN_DECLS
-#pragma GCC visibility push(default)
-
-/*
- * ANSI/POSIX
- */
-extern const union __infinity_un {
-	unsigned char	__uc[8];
-	double		__ud;
-} __infinity;
-
-extern const union __nan_un {
-	unsigned char	__uc[sizeof(float)];
-	float		__uf;
-} __nan;
-
-#if __GNUC_PREREQ(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
-#define	__MATH_BUILTIN_CONSTANTS
-#endif
-
-#if __GNUC_PREREQ(3, 0) && !defined(__INTEL_COMPILER)
-#define	__MATH_BUILTIN_RELOPS
-#endif
-
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VAL	__builtin_huge_val()
-#else
-#define	HUGE_VAL	(__infinity.__ud)
-#endif
-
-#if __ISO_C_VISIBLE >= 1999
-#define	FP_ILOGB0	(-INT_MAX) /* Android-changed */
-#define	FP_ILOGBNAN	INT_MAX /* Android-changed */
-
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VALF	__builtin_huge_valf()
-#define	HUGE_VALL	__builtin_huge_vall()
-#define	INFINITY	__builtin_inff()
-#define	NAN		__builtin_nanf("")
-#else
-#define	HUGE_VALF	(float)HUGE_VAL
-#define	HUGE_VALL	(long double)HUGE_VAL
-#define	INFINITY	HUGE_VALF
-#define	NAN		(__nan.__uf)
-#endif /* __MATH_BUILTIN_CONSTANTS */
-
-#define	MATH_ERRNO	1
-#define	MATH_ERREXCEPT	2
-#define	math_errhandling	MATH_ERREXCEPT
-
-#define	FP_FAST_FMAF	1
-#ifdef __ia64__
-#define	FP_FAST_FMA	1
-#define	FP_FAST_FMAL	1
-#endif
-
-/* Symbolic constants to classify floating point numbers. */
-#define	FP_INFINITE	0x01
-#define	FP_NAN		0x02
-#define	FP_NORMAL	0x04
-#define	FP_SUBNORMAL	0x08
-#define	FP_ZERO		0x10
-#define	fpclassify(x) \
-    ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \
-    : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \
-    : __fpclassifyl(x))
-
-#define	isfinite(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isfinite(x)	\
-    : __isfinitel(x))
-#define	isinf(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isinff(x)	\
-    : (sizeof (x) == sizeof (double)) ? isinf(x)	\
-    : __isinfl(x))
-#define	isnan(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isnanf(x)	\
-    : (sizeof (x) == sizeof (double)) ? isnan(x)	\
-    : __isnanl(x))
-#define	isnormal(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isnormalf(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isnormal(x)	\
-    : __isnormall(x))
-
-#ifdef __MATH_BUILTIN_RELOPS
-#define	isgreater(x, y)		__builtin_isgreater((x), (y))
-#define	isgreaterequal(x, y)	__builtin_isgreaterequal((x), (y))
-#define	isless(x, y)		__builtin_isless((x), (y))
-#define	islessequal(x, y)	__builtin_islessequal((x), (y))
-#define	islessgreater(x, y)	__builtin_islessgreater((x), (y))
-#define	isunordered(x, y)	__builtin_isunordered((x), (y))
-#else
-#define	isgreater(x, y)		(!isunordered((x), (y)) && (x) > (y))
-#define	isgreaterequal(x, y)	(!isunordered((x), (y)) && (x) >= (y))
-#define	isless(x, y)		(!isunordered((x), (y)) && (x) < (y))
-#define	islessequal(x, y)	(!isunordered((x), (y)) && (x) <= (y))
-#define	islessgreater(x, y)	(!isunordered((x), (y)) && \
-					((x) > (y) || (y) > (x)))
-#define	isunordered(x, y)	(isnan(x) || isnan(y))
-#endif /* __MATH_BUILTIN_RELOPS */
-
-#define	signbit(x)					\
-    ((sizeof (x) == sizeof (float)) ? __signbitf(x)	\
-    : (sizeof (x) == sizeof (double)) ? __signbit(x)	\
-    : __signbitl(x))
-
-typedef double __double_t;
-typedef __double_t double_t;
-typedef float __float_t;
-typedef __float_t float_t;
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-/*
- * XOPEN/SVID
- */
-#if __BSD_VISIBLE || __XSI_VISIBLE
-#define	M_E		2.7182818284590452354	/* e */
-#define	M_LOG2E		1.4426950408889634074	/* log 2e */
-#define	M_LOG10E	0.43429448190325182765	/* log 10e */
-#define	M_LN2		0.69314718055994530942	/* log e2 */
-#define	M_LN10		2.30258509299404568402	/* log e10 */
-#define	M_PI		3.14159265358979323846	/* pi */
-#define	M_PI_2		1.57079632679489661923	/* pi/2 */
-#define	M_PI_4		0.78539816339744830962	/* pi/4 */
-#define	M_1_PI		0.31830988618379067154	/* 1/pi */
-#define	M_2_PI		0.63661977236758134308	/* 2/pi */
-#define	M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
-#define	M_SQRT2		1.41421356237309504880	/* sqrt(2) */
-#define	M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
-
-#define	MAXFLOAT	((float)3.40282346638528860e+38)
-extern int signgam;
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE
-#if 0
-/* Old value from 4.4BSD-Lite math.h; this is probably better. */
-#define	HUGE		HUGE_VAL
-#else
-#define	HUGE		MAXFLOAT
-#endif
-#endif /* __BSD_VISIBLE */
-
-/*
- * Most of these functions depend on the rounding mode and have the side
- * effect of raising floating-point exceptions, so they are not declared
- * as __pure2.  In C99, FENV_ACCESS affects the purity of these functions.
- */
-
-/*
- * ANSI/POSIX
- */
-int	__fpclassifyd(double) __NDK_FPABI_MATH__  __pure2;
-int	__fpclassifyf(float) __NDK_FPABI_MATH__  __pure2;
-int	__fpclassifyl(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isfinitef(float) __NDK_FPABI_MATH__  __pure2;
-int	__isfinite(double) __NDK_FPABI_MATH__  __pure2;
-int	__isfinitel(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isinff(float) __NDK_FPABI_MATH__  __pure2;
-int	__isinfl(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isnanf(float) __NDK_FPABI_MATH__  __pure2;
-int	__isnanl(long double) __NDK_FPABI_MATH__  __pure2;
-int	__isnormalf(float) __NDK_FPABI_MATH__  __pure2;
-int	__isnormal(double) __NDK_FPABI_MATH__  __pure2;
-int	__isnormall(long double) __NDK_FPABI_MATH__  __pure2;
-int	__signbit(double) __NDK_FPABI_MATH__  __pure2;
-int	__signbitf(float) __NDK_FPABI_MATH__  __pure2;
-int	__signbitl(long double) __NDK_FPABI_MATH__  __pure2;
-
-double	acos(double) __NDK_FPABI_MATH__;
-double	asin(double) __NDK_FPABI_MATH__;
-double	atan(double) __NDK_FPABI_MATH__;
-double	atan2(double, double) __NDK_FPABI_MATH__;
-double	cos(double) __NDK_FPABI_MATH__;
-double	sin(double) __NDK_FPABI_MATH__;
-double	tan(double) __NDK_FPABI_MATH__;
-
-double	cosh(double) __NDK_FPABI_MATH__;
-double	sinh(double) __NDK_FPABI_MATH__;
-double	tanh(double) __NDK_FPABI_MATH__;
-
-double	exp(double) __NDK_FPABI_MATH__;
-double	frexp(double, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-double	ldexp(double, int) __NDK_FPABI_MATH__;
-double	log(double) __NDK_FPABI_MATH__;
-double	log10(double) __NDK_FPABI_MATH__;
-double	modf(double, double *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-double	pow(double, double) __NDK_FPABI_MATH__;
-double	sqrt(double) __NDK_FPABI_MATH__;
-
-double	ceil(double) __NDK_FPABI_MATH__;
-double	fabs(double) __NDK_FPABI_MATH__ __pure2;
-double	floor(double) __NDK_FPABI_MATH__;
-double	fmod(double, double) __NDK_FPABI_MATH__;
-
-/*
- * These functions are not in C90.
- */
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-double	acosh(double) __NDK_FPABI_MATH__;
-double	asinh(double) __NDK_FPABI_MATH__;
-double	atanh(double) __NDK_FPABI_MATH__;
-double	cbrt(double) __NDK_FPABI_MATH__;
-double	erf(double) __NDK_FPABI_MATH__;
-double	erfc(double) __NDK_FPABI_MATH__;
-double	exp2(double) __NDK_FPABI_MATH__;
-double	expm1(double) __NDK_FPABI_MATH__;
-double	fma(double, double, double) __NDK_FPABI_MATH__;
-double	hypot(double, double) __NDK_FPABI_MATH__;
-int	ilogb(double) __NDK_FPABI_MATH__ __pure2;
-int	(isinf)(double) __NDK_FPABI_MATH__ __pure2;
-int	(isnan)(double) __NDK_FPABI_MATH__ __pure2;
-double	lgamma(double) __NDK_FPABI_MATH__;
-long long llrint(double) __NDK_FPABI_MATH__;
-long long llround(double) __NDK_FPABI_MATH__;
-double	log1p(double) __NDK_FPABI_MATH__;
-double	log2(double) __NDK_FPABI_MATH__;
-double	logb(double) __NDK_FPABI_MATH__;
-long	lrint(double) __NDK_FPABI_MATH__;
-long	lround(double) __NDK_FPABI_MATH__;
-double	nan(const char *) __NDK_FPABI_MATH__ __pure2;
-double	nextafter(double, double) __NDK_FPABI_MATH__;
-double	remainder(double, double) __NDK_FPABI_MATH__;
-double	remquo(double, double, int *) __NDK_FPABI_MATH__;
-double	rint(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __XSI_VISIBLE
-double	j0(double) __NDK_FPABI_MATH__;
-double	j1(double) __NDK_FPABI_MATH__;
-double	jn(int, double) __NDK_FPABI_MATH__;
-double	y0(double) __NDK_FPABI_MATH__;
-double	y1(double) __NDK_FPABI_MATH__;
-double	yn(int, double) __NDK_FPABI_MATH__;
-
-#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
-double	gamma(double) __NDK_FPABI_MATH__;
-#endif
-
-#if __XSI_VISIBLE <= 600 || __BSD_VISIBLE
-double	scalb(double, double) __NDK_FPABI_MATH__;
-#endif
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-double	copysign(double, double) __NDK_FPABI_MATH__ __pure2;
-double	fdim(double, double) __NDK_FPABI_MATH__;
-double	fmax(double, double) __NDK_FPABI_MATH__ __pure2;
-double	fmin(double, double) __NDK_FPABI_MATH__ __pure2;
-double	nearbyint(double) __NDK_FPABI_MATH__;
-double	round(double) __NDK_FPABI_MATH__;
-double	scalbln(double, long) __NDK_FPABI_MATH__;
-double	scalbn(double, int) __NDK_FPABI_MATH__;
-double	tgamma(double) __NDK_FPABI_MATH__;
-double	trunc(double) __NDK_FPABI_MATH__;
-#endif
-
-/*
- * BSD math library entry points
- */
-#if __BSD_VISIBLE
-double	drem(double, double) __NDK_FPABI_MATH__;
-int	finite(double) __NDK_FPABI_MATH__ __pure2;
-int	isnanf(float) __NDK_FPABI_MATH__ __pure2;
-long double significandl(long double) __NDK_FPABI_MATH__;
-
-/*
- * Reentrant version of gamma & lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-double	gamma_r(double, int *) __NDK_FPABI_MATH__;
-double	lgamma_r(double, int *) __NDK_FPABI_MATH__;
-
-/*
- * IEEE Test Vector
- */
-double	significand(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE */
-
-/* float versions of ANSI/POSIX functions */
-#if __ISO_C_VISIBLE >= 1999
-float	acosf(float) __NDK_FPABI_MATH__;
-float	asinf(float) __NDK_FPABI_MATH__;
-float	atanf(float) __NDK_FPABI_MATH__;
-float	atan2f(float, float) __NDK_FPABI_MATH__;
-float	cosf(float) __NDK_FPABI_MATH__;
-float	sinf(float) __NDK_FPABI_MATH__;
-float	tanf(float) __NDK_FPABI_MATH__;
-
-float	coshf(float) __NDK_FPABI_MATH__;
-float	sinhf(float) __NDK_FPABI_MATH__;
-float	tanhf(float) __NDK_FPABI_MATH__;
-
-float	exp2f(float) __NDK_FPABI_MATH__;
-float	expf(float) __NDK_FPABI_MATH__;
-float	expm1f(float) __NDK_FPABI_MATH__;
-float	frexpf(float, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-int	ilogbf(float) __NDK_FPABI_MATH__ __pure2;
-float	ldexpf(float, int) __NDK_FPABI_MATH__;
-float	log10f(float) __NDK_FPABI_MATH__;
-float	log1pf(float) __NDK_FPABI_MATH__;
-float	log2f(float) __NDK_FPABI_MATH__;
-float	logf(float) __NDK_FPABI_MATH__;
-float	modff(float, float *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-float	powf(float, float) __NDK_FPABI_MATH__;
-float	sqrtf(float) __NDK_FPABI_MATH__;
-
-float	ceilf(float) __NDK_FPABI_MATH__;
-float	fabsf(float) __NDK_FPABI_MATH__ __pure2;
-float	floorf(float) __NDK_FPABI_MATH__;
-float	fmodf(float, float) __NDK_FPABI_MATH__;
-float	roundf(float) __NDK_FPABI_MATH__;
-
-float	erff(float) __NDK_FPABI_MATH__;
-float	erfcf(float) __NDK_FPABI_MATH__;
-float	hypotf(float, float) __NDK_FPABI_MATH__;
-float	lgammaf(float) __NDK_FPABI_MATH__;
-float	tgammaf(float) __NDK_FPABI_MATH__;
-
-float	acoshf(float) __NDK_FPABI_MATH__;
-float	asinhf(float) __NDK_FPABI_MATH__;
-float	atanhf(float) __NDK_FPABI_MATH__;
-float	cbrtf(float) __NDK_FPABI_MATH__;
-float	logbf(float) __NDK_FPABI_MATH__;
-float	copysignf(float, float) __NDK_FPABI_MATH__ __pure2;
-long long llrintf(float) __NDK_FPABI_MATH__;
-long long llroundf(float) __NDK_FPABI_MATH__;
-long	lrintf(float) __NDK_FPABI_MATH__;
-long	lroundf(float) __NDK_FPABI_MATH__;
-float	nanf(const char *) __NDK_FPABI_MATH__ __pure2;
-float	nearbyintf(float) __NDK_FPABI_MATH__;
-float	nextafterf(float, float) __NDK_FPABI_MATH__;
-float	remainderf(float, float) __NDK_FPABI_MATH__;
-float	remquof(float, float, int *) __NDK_FPABI_MATH__;
-float	rintf(float) __NDK_FPABI_MATH__;
-float	scalblnf(float, long) __NDK_FPABI_MATH__;
-float	scalbnf(float, int) __NDK_FPABI_MATH__;
-float	truncf(float) __NDK_FPABI_MATH__;
-
-float	fdimf(float, float) __NDK_FPABI_MATH__;
-float	fmaf(float, float, float) __NDK_FPABI_MATH__;
-float	fmaxf(float, float) __NDK_FPABI_MATH__ __pure2;
-float	fminf(float, float) __NDK_FPABI_MATH__ __pure2;
-#endif
-
-/*
- * float versions of BSD math library entry points
- */
-#if __BSD_VISIBLE
-float	dremf(float, float) __NDK_FPABI_MATH__;
-int	finitef(float) __NDK_FPABI_MATH__ __pure2;
-float	gammaf(float) __NDK_FPABI_MATH__;
-float	j0f(float) __NDK_FPABI_MATH__;
-float	j1f(float) __NDK_FPABI_MATH__;
-float	jnf(int, float) __NDK_FPABI_MATH__;
-float	scalbf(float, float) __NDK_FPABI_MATH__;
-float	y0f(float) __NDK_FPABI_MATH__;
-float	y1f(float) __NDK_FPABI_MATH__;
-float	ynf(int, float) __NDK_FPABI_MATH__;
-
-/*
- * Float versions of reentrant version of gamma & lgamma; passes
- * signgam back by reference as the second argument; user must
- * allocate space for signgam.
- */
-float	gammaf_r(float, int *) __NDK_FPABI_MATH__;
-float	lgammaf_r(float, int *) __NDK_FPABI_MATH__;
-
-/*
- * float version of IEEE Test Vector
- */
-float	significandf(float) __NDK_FPABI_MATH__;
-#endif	/* __BSD_VISIBLE */
-
-/*
- * long double versions of ISO/POSIX math functions
- */
-#if __ISO_C_VISIBLE >= 1999
-long double	acoshl(long double) __NDK_FPABI_MATH__;
-long double	acosl(long double) __NDK_FPABI_MATH__;
-long double	asinhl(long double) __NDK_FPABI_MATH__;
-long double	asinl(long double) __NDK_FPABI_MATH__;
-long double	atan2l(long double, long double) __NDK_FPABI_MATH__;
-long double	atanhl(long double) __NDK_FPABI_MATH__;
-long double	atanl(long double) __NDK_FPABI_MATH__;
-long double	cbrtl(long double) __NDK_FPABI_MATH__;
-long double	ceill(long double) __NDK_FPABI_MATH__;
-long double	copysignl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	coshl(long double) __NDK_FPABI_MATH__;
-long double	cosl(long double) __NDK_FPABI_MATH__;
-long double	erfcl(long double) __NDK_FPABI_MATH__;
-long double	erfl(long double) __NDK_FPABI_MATH__;
-long double	exp2l(long double) __NDK_FPABI_MATH__;
-long double	expl(long double) __NDK_FPABI_MATH__;
-long double	expm1l(long double) __NDK_FPABI_MATH__;
-long double	fabsl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	fdiml(long double, long double) __NDK_FPABI_MATH__;
-long double	floorl(long double) __NDK_FPABI_MATH__;
-long double	fmal(long double, long double, long double) __NDK_FPABI_MATH__;
-long double	fmaxl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	fminl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	fmodl(long double, long double) __NDK_FPABI_MATH__;
-long double	frexpl(long double value, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	hypotl(long double, long double) __NDK_FPABI_MATH__;
-int		ilogbl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	ldexpl(long double, int) __NDK_FPABI_MATH__;
-long double	lgammal(long double) __NDK_FPABI_MATH__;
-long long	llrintl(long double) __NDK_FPABI_MATH__;
-long long	llroundl(long double) __NDK_FPABI_MATH__;
-long double	log10l(long double) __NDK_FPABI_MATH__;
-long double	log1pl(long double) __NDK_FPABI_MATH__;
-long double	log2l(long double) __NDK_FPABI_MATH__;
-long double	logbl(long double) __NDK_FPABI_MATH__;
-long double	logl(long double) __NDK_FPABI_MATH__;
-long		lrintl(long double) __NDK_FPABI_MATH__;
-long		lroundl(long double) __NDK_FPABI_MATH__;
-long double	modfl(long double, long double *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	nanl(const char *) __NDK_FPABI_MATH__ __pure2;
-long double	nearbyintl(long double) __NDK_FPABI_MATH__;
-long double	nextafterl(long double, long double) __NDK_FPABI_MATH__;
-double		nexttoward(double, long double) __NDK_FPABI_MATH__;
-float		nexttowardf(float, long double) __NDK_FPABI_MATH__;
-long double	nexttowardl(long double, long double) __NDK_FPABI_MATH__;
-long double	powl(long double, long double) __NDK_FPABI_MATH__;
-long double	remainderl(long double, long double) __NDK_FPABI_MATH__;
-long double	remquol(long double, long double, int *) __NDK_FPABI_MATH__;
-long double	rintl(long double) __NDK_FPABI_MATH__;
-long double	roundl(long double) __NDK_FPABI_MATH__;
-long double	scalblnl(long double, long) __NDK_FPABI_MATH__;
-long double	scalbnl(long double, int) __NDK_FPABI_MATH__;
-long double	sinhl(long double) __NDK_FPABI_MATH__;
-long double	sinl(long double) __NDK_FPABI_MATH__;
-long double	sqrtl(long double) __NDK_FPABI_MATH__;
-long double	tanhl(long double) __NDK_FPABI_MATH__;
-long double	tanl(long double) __NDK_FPABI_MATH__;
-long double	tgammal(long double) __NDK_FPABI_MATH__;
-long double	truncl(long double) __NDK_FPABI_MATH__;
-
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-#if defined(_GNU_SOURCE)
-void sincos(double, double*, double*) __NDK_FPABI_MATH__;
-void sincosf(float, float*, float*) __NDK_FPABI_MATH__;
-void sincosl(long double, long double*, long double*) __NDK_FPABI_MATH__;
-#endif /* _GNU_SOURCE */
-
-/* builtin version of all the above math functions are annotated too */
-
-double	__builtin_acos(double) __NDK_FPABI_MATH__;
-double	__builtin_asin(double) __NDK_FPABI_MATH__;
-double	__builtin_atan(double) __NDK_FPABI_MATH__;
-double	__builtin_atan2(double, double) __NDK_FPABI_MATH__;
-double	__builtin_cos(double) __NDK_FPABI_MATH__;
-double	__builtin_sin(double) __NDK_FPABI_MATH__;
-double	__builtin_tan(double) __NDK_FPABI_MATH__;
-
-double	__builtin_cosh(double) __NDK_FPABI_MATH__;
-double	__builtin_sinh(double) __NDK_FPABI_MATH__;
-double	__builtin_tanh(double) __NDK_FPABI_MATH__;
-
-double	__builtin_exp(double) __NDK_FPABI_MATH__;
-double	__builtin_frexp(double, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-double	__builtin_ldexp(double, int) __NDK_FPABI_MATH__;
-double	__builtin_log(double) __NDK_FPABI_MATH__;
-double	__builtin_log10(double) __NDK_FPABI_MATH__;
-double	__builtin_modf(double, double *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-double	__builtin_pow(double, double) __NDK_FPABI_MATH__;
-double	__builtin_sqrt(double) __NDK_FPABI_MATH__;
-
-double	__builtin_ceil(double) __NDK_FPABI_MATH__;
-double	__builtin_fabs(double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_floor(double) __NDK_FPABI_MATH__;
-double	__builtin_fmod(double, double) __NDK_FPABI_MATH__;
-
-/*
- * These functions are not in C90.
- */
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-double	__builtin_acosh(double) __NDK_FPABI_MATH__;
-double	__builtin_asinh(double) __NDK_FPABI_MATH__;
-double	__builtin_atanh(double) __NDK_FPABI_MATH__;
-double	__builtin_cbrt(double) __NDK_FPABI_MATH__;
-double	__builtin_erf(double) __NDK_FPABI_MATH__;
-double	__builtin_erfc(double) __NDK_FPABI_MATH__;
-double	__builtin_exp2(double) __NDK_FPABI_MATH__;
-double	__builtin_expm1(double) __NDK_FPABI_MATH__;
-double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
-double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
-int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
-int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
-int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
-#else
-/* clang < 3.5 has faulty prototype for __builtin_isnan */
-#endif
-double	__builtin_lgamma(double) __NDK_FPABI_MATH__;
-long long __builtin_llrint(double) __NDK_FPABI_MATH__;
-long long __builtin_llround(double) __NDK_FPABI_MATH__;
-double	__builtin_log1p(double) __NDK_FPABI_MATH__;
-double	__builtin_log2(double) __NDK_FPABI_MATH__;
-double	__builtin_logb(double) __NDK_FPABI_MATH__;
-long	__builtin_lrint(double) __NDK_FPABI_MATH__;
-long	__builtin_lround(double) __NDK_FPABI_MATH__;
-double	__builtin_nan(const char *) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_nextafter(double, double) __NDK_FPABI_MATH__;
-double	__builtin_remainder(double, double) __NDK_FPABI_MATH__;
-double	__builtin_remquo(double, double, int *) __NDK_FPABI_MATH__;
-double	__builtin_rint(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __XSI_VISIBLE
-double	__builtin_j0(double) __NDK_FPABI_MATH__;
-double	__builtin_j1(double) __NDK_FPABI_MATH__;
-double	__builtin_jn(int, double) __NDK_FPABI_MATH__;
-double	__builtin_y0(double) __NDK_FPABI_MATH__;
-double	__builtin_y1(double) __NDK_FPABI_MATH__;
-double	__builtin_yn(int, double) __NDK_FPABI_MATH__;
-
-#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
-double	__builtin_gamma(double) __NDK_FPABI_MATH__;
-#endif
-
-#if __XSI_VISIBLE <= 600 || __BSD_VISIBLE
-double	__builtin_scalb(double, double) __NDK_FPABI_MATH__;
-#endif
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-double	__builtin_copysign(double, double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_fdim(double, double) __NDK_FPABI_MATH__;
-double	__builtin_fmax(double, double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_fmin(double, double) __NDK_FPABI_MATH__ __pure2;
-double	__builtin_nearbyint(double) __NDK_FPABI_MATH__;
-double	__builtin_round(double) __NDK_FPABI_MATH__;
-double	__builtin_scalbln(double, long) __NDK_FPABI_MATH__;
-double	__builtin_scalbn(double, int) __NDK_FPABI_MATH__;
-double	__builtin_tgamma(double) __NDK_FPABI_MATH__;
-double	__builtin_trunc(double) __NDK_FPABI_MATH__;
-#endif
-
-/*
- * BSD math library entry points
- */
-#if __BSD_VISIBLE
-double	__builtin_drem(double, double) __NDK_FPABI_MATH__;
-int	__builtin_finite(double) __NDK_FPABI_MATH__ __pure2;
-int	__builtin_isnanf(float) __NDK_FPABI_MATH__ __pure2;
-long double significandl(long double) __NDK_FPABI_MATH__;
-
-/*
- * Reentrant version of gamma & lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-double	__builtin_gamma_r(double, int *) __NDK_FPABI_MATH__;
-double	__builtin_lgamma_r(double, int *) __NDK_FPABI_MATH__;
-
-/*
- * IEEE Test Vector
- */
-double	__builtin_significand(double) __NDK_FPABI_MATH__;
-#endif /* __BSD_VISIBLE */
-
-/* float versions of ANSI/POSIX functions */
-#if __ISO_C_VISIBLE >= 1999
-float	__builtin_acosf(float) __NDK_FPABI_MATH__;
-float	__builtin_asinf(float) __NDK_FPABI_MATH__;
-float	__builtin_atanf(float) __NDK_FPABI_MATH__;
-float	__builtin_atan2f(float, float) __NDK_FPABI_MATH__;
-float	__builtin_cosf(float) __NDK_FPABI_MATH__;
-float	__builtin_sinf(float) __NDK_FPABI_MATH__;
-float	__builtin_tanf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_coshf(float) __NDK_FPABI_MATH__;
-float	__builtin_sinhf(float) __NDK_FPABI_MATH__;
-float	__builtin_tanhf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_exp2f(float) __NDK_FPABI_MATH__;
-float	__builtin_expf(float) __NDK_FPABI_MATH__;
-float	__builtin_expm1f(float) __NDK_FPABI_MATH__;
-float	__builtin_frexpf(float, int *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-int	__builtin_ilogbf(float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_ldexpf(float, int) __NDK_FPABI_MATH__;
-float	__builtin_log10f(float) __NDK_FPABI_MATH__;
-float	__builtin_log1pf(float) __NDK_FPABI_MATH__;
-float	__builtin_log2f(float) __NDK_FPABI_MATH__;
-float	__builtin_logf(float) __NDK_FPABI_MATH__;
-float	__builtin_modff(float, float *) __NDK_FPABI_MATH__;	/* fundamentally !__pure2 */
-
-float	__builtin_powf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_sqrtf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_ceilf(float) __NDK_FPABI_MATH__;
-float	__builtin_fabsf(float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_floorf(float) __NDK_FPABI_MATH__;
-float	__builtin_fmodf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_roundf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_erff(float) __NDK_FPABI_MATH__;
-float	__builtin_erfcf(float) __NDK_FPABI_MATH__;
-float	__builtin_hypotf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_lgammaf(float) __NDK_FPABI_MATH__;
-float	__builtin_tgammaf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_acoshf(float) __NDK_FPABI_MATH__;
-float	__builtin_asinhf(float) __NDK_FPABI_MATH__;
-float	__builtin_atanhf(float) __NDK_FPABI_MATH__;
-float	__builtin_cbrtf(float) __NDK_FPABI_MATH__;
-float	__builtin_logbf(float) __NDK_FPABI_MATH__;
-float	__builtin_copysignf(float, float) __NDK_FPABI_MATH__ __pure2;
-long long __builtin_llrintf(float) __NDK_FPABI_MATH__;
-long long __builtin_llroundf(float) __NDK_FPABI_MATH__;
-long	__builtin_lrintf(float) __NDK_FPABI_MATH__;
-long	__builtin_lroundf(float) __NDK_FPABI_MATH__;
-float	__builtin_nanf(const char *) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_nearbyintf(float) __NDK_FPABI_MATH__;
-float	__builtin_nextafterf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_remainderf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_remquof(float, float, int *) __NDK_FPABI_MATH__;
-float	__builtin_rintf(float) __NDK_FPABI_MATH__;
-float	__builtin_scalblnf(float, long) __NDK_FPABI_MATH__;
-float	__builtin_scalbnf(float, int) __NDK_FPABI_MATH__;
-float	__builtin_truncf(float) __NDK_FPABI_MATH__;
-
-float	__builtin_fdimf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_fmaf(float, float, float) __NDK_FPABI_MATH__;
-float	__builtin_fmaxf(float, float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_fminf(float, float) __NDK_FPABI_MATH__ __pure2;
-#endif
-
-/*
- * float versions of BSD math library entry points
- */
-#if __BSD_VISIBLE
-float	__builtin_dremf(float, float) __NDK_FPABI_MATH__;
-int	__builtin_finitef(float) __NDK_FPABI_MATH__ __pure2;
-float	__builtin_gammaf(float) __NDK_FPABI_MATH__;
-float	__builtin_j0f(float) __NDK_FPABI_MATH__;
-float	__builtin_j1f(float) __NDK_FPABI_MATH__;
-float	__builtin_jnf(int, float) __NDK_FPABI_MATH__;
-float	__builtin_scalbf(float, float) __NDK_FPABI_MATH__;
-float	__builtin_y0f(float) __NDK_FPABI_MATH__;
-float	__builtin_y1f(float) __NDK_FPABI_MATH__;
-float	__builtin_ynf(int, float) __NDK_FPABI_MATH__;
-
-/*
- * Float versions of reentrant version of gamma & lgamma; passes
- * signgam back by reference as the second argument; user must
- * allocate space for signgam.
- */
-float	__builtin_gammaf_r(float, int *) __NDK_FPABI_MATH__;
-float	__builtin_lgammaf_r(float, int *) __NDK_FPABI_MATH__;
-
-/*
- * float version of IEEE Test Vector
- */
-float	__builtin_significandf(float) __NDK_FPABI_MATH__;
-#endif	/* __BSD_VISIBLE */
-
-/*
- * long double versions of ISO/POSIX math functions
- */
-#if __ISO_C_VISIBLE >= 1999
-long double	__builtin_acoshl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_acosl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_asinhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_asinl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_atan2l(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_atanhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_atanl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_cbrtl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_ceill(long double) __NDK_FPABI_MATH__;
-long double	__builtin_copysignl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_coshl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_cosl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_erfcl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_erfl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_exp2l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_expl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_expm1l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_fabsl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_fdiml(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_floorl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_fmal(long double, long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_fmaxl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_fminl(long double, long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_fmodl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_frexpl(long double value, int *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	__builtin_hypotl(long double, long double) __NDK_FPABI_MATH__;
-int		__builtin_ilogbl(long double) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_ldexpl(long double, int) __NDK_FPABI_MATH__;
-long double	__builtin_lgammal(long double) __NDK_FPABI_MATH__;
-long long	__builtin_llrintl(long double) __NDK_FPABI_MATH__;
-long long	__builtin_llroundl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_log10l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_log1pl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_log2l(long double) __NDK_FPABI_MATH__;
-long double	__builtin_logbl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_logl(long double) __NDK_FPABI_MATH__;
-long		__builtin_lrintl(long double) __NDK_FPABI_MATH__;
-long		__builtin_lroundl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_modfl(long double, long double *) __NDK_FPABI_MATH__; /* fundamentally !__pure2 */
-long double	__builtin_nanl(const char *) __NDK_FPABI_MATH__ __pure2;
-long double	__builtin_nearbyintl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_nextafterl(long double, long double) __NDK_FPABI_MATH__;
-double		__builtin_nexttoward(double, long double) __NDK_FPABI_MATH__;
-float		__builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__;
-long double	__builtin_nexttowardl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_powl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_remainderl(long double, long double) __NDK_FPABI_MATH__;
-long double	__builtin_remquol(long double, long double, int *) __NDK_FPABI_MATH__;
-long double	__builtin_rintl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_roundl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_scalblnl(long double, long) __NDK_FPABI_MATH__;
-long double	__builtin_scalbnl(long double, int) __NDK_FPABI_MATH__;
-long double	__builtin_sinhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_sinl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_sqrtl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_tanhl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_tanl(long double) __NDK_FPABI_MATH__;
-long double	__builtin_tgammal(long double) __NDK_FPABI_MATH__;
-long double	__builtin_truncl(long double) __NDK_FPABI_MATH__;
-
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-#if defined(_GNU_SOURCE)
-void __builtin_sincos(double, double*, double*) __NDK_FPABI_MATH__;
-void __builtin_sincosf(float, float*, float*) __NDK_FPABI_MATH__;
-void __builtin_sincosl(long double, long double*, long double*) __NDK_FPABI_MATH__;
-#endif /* _GNU_SOURCE */
-
-#pragma GCC visibility pop
-__END_DECLS
-
-#endif /* !_MATH_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/signal.h b/9/platforms/android-19/arch-x86_64/usr/include/signal.h
deleted file mode 100644
index f1849c5..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/signal.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _SIGNAL_H_
-#define _SIGNAL_H_
-
-#include <errno.h>
-#include <sys/cdefs.h>
-#include <limits.h>		/* For LONG_BIT */
-#include <string.h>		/* For memset() */
-#include <sys/types.h>
-#include <asm/sigcontext.h>
-
-#if defined(__LP64__) || defined(__mips__)
-/* For 64-bit (and mips), the kernel's struct sigaction doesn't match the POSIX one,
- * so we need to expose our own and translate behind the scenes. */
-#  define sigaction __kernel_sigaction
-#  include <linux/signal.h>
-#  undef sigaction
-#else
-/* For 32-bit, we're stuck with the definitions we already shipped,
- * even though they contain a sigset_t that's too small. */
-#  include <linux/signal.h>
-#endif
-
-__BEGIN_DECLS
-
-typedef int sig_atomic_t;
-
-/* The arm and x86 kernel header files don't define _NSIG. */
-#ifndef _KERNEL__NSIG
-#define _KERNEL__NSIG 64
-#endif
-
-/* Userspace's NSIG is the kernel's _NSIG + 1. */
-#define _NSIG (_KERNEL__NSIG + 1)
-#define NSIG _NSIG
-
-/* We take a few real-time signals for ourselves. May as well use the same names as glibc. */
-#define SIGRTMIN (__libc_current_sigrtmin())
-#define SIGRTMAX (__libc_current_sigrtmax())
-extern int __libc_current_sigrtmin(void);
-extern int __libc_current_sigrtmax(void);
-
-extern const char* const sys_siglist[];
-extern const char* const sys_signame[]; /* BSD compatibility. */
-
-typedef __sighandler_t sig_t; /* BSD compatibility. */
-typedef __sighandler_t sighandler_t; /* glibc compatibility. */
-
-#define si_timerid si_tid /* glibc compatibility. */
-
-#if defined(__LP64__)
-
-struct sigaction {
-  unsigned int sa_flags;
-  union {
-    sighandler_t sa_handler;
-    void (*sa_sigaction)(int, struct siginfo*, void*);
-  };
-  sigset_t sa_mask;
-  void (*sa_restorer)(void);
-};
-
-#elif defined(__mips__)
-
-struct sigaction {
-  unsigned int sa_flags;
-  union {
-    sighandler_t sa_handler;
-    void (*sa_sigaction) (int, struct siginfo*, void*);
-  };
-  sigset_t sa_mask;
-};
-
-#endif
-
-extern int sigaction(int, const struct sigaction*, struct sigaction*);
-
-extern sighandler_t signal(int, sighandler_t);
-
-extern int siginterrupt(int, int);
-
-extern int sigaddset(sigset_t*, int);
-extern int sigdelset(sigset_t*, int);
-extern int sigemptyset(sigset_t*);
-extern int sigfillset(sigset_t*);
-extern int sigismember(const sigset_t*, int);
-
-extern int sigpending(sigset_t*) __nonnull((1));
-extern int sigprocmask(int, const sigset_t*, sigset_t*);
-extern int sigsuspend(const sigset_t*) __nonnull((1));
-extern int sigwait(const sigset_t*, int*) __nonnull((1, 2));
-
-extern int raise(int);
-extern int kill(pid_t, int);
-extern int killpg(int, int);
-
-extern int sigaltstack(const stack_t*, stack_t*);
-
-extern void psiginfo(const siginfo_t*, const char*);
-extern void psignal(int, const char*);
-
-__END_DECLS
-
-#endif /* _SIGNAL_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdatomic.h b/9/platforms/android-19/arch-x86_64/usr/include/stdatomic.h
deleted file mode 100644
index 3db25a7..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/stdatomic.h
+++ /dev/null
@@ -1,575 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
- *                    David Chisnall <theraven@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _STDATOMIC_H_
-#define	_STDATOMIC_H_
-
-#include <sys/cdefs.h>
-
-
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
-# ifdef __clang__
-#  if __has_feature(cxx_atomic)
-#   define _STDATOMIC_HAVE_ATOMIC
-#  endif
-# else /* gcc */
-#  if __GNUC_PREREQ(4, 7)
-#   define _STDATOMIC_HAVE_ATOMIC
-#  endif
-# endif
-#endif
-
-#ifdef _STDATOMIC_HAVE_ATOMIC
-
-/* We have a usable C++ <atomic>; use it instead.  */
-
-#include <atomic>
-
-#undef _Atomic
-        /* Also defined by <atomic> for gcc.  But not used in macros. */
-        /* Also a clang intrinsic.                                    */
-        /* Should not be used by client code before this file is      */
-        /* included.  The definitions in <atomic> themselves see      */
-        /* the old definition, as they should.                        */
-        /* Client code sees the following definition.                 */
-
-#define _Atomic(t) std::atomic<t>
-
-using std::atomic_is_lock_free;
-using std::atomic_init;
-using std::atomic_store;
-using std::atomic_store_explicit;
-using std::atomic_load;
-using std::atomic_load_explicit;
-using std::atomic_exchange;
-using std::atomic_exchange_explicit;
-using std::atomic_compare_exchange_strong;
-using std::atomic_compare_exchange_strong_explicit;
-using std::atomic_compare_exchange_weak;
-using std::atomic_compare_exchange_weak_explicit;
-using std::atomic_fetch_add;
-using std::atomic_fetch_add_explicit;
-using std::atomic_fetch_sub;
-using std::atomic_fetch_sub_explicit;
-using std::atomic_fetch_or;
-using std::atomic_fetch_or_explicit;
-using std::atomic_fetch_xor;
-using std::atomic_fetch_xor_explicit;
-using std::atomic_fetch_and;
-using std::atomic_fetch_and_explicit;
-using std::atomic_thread_fence;
-using std::atomic_signal_fence;
-
-using std::memory_order;
-using std::memory_order_relaxed;
-using std::memory_order_consume;
-using std::memory_order_release;
-using std::memory_order_acq_rel;
-using std::memory_order_seq_cst;
-
-using std::atomic_bool;
-using std::atomic_char;
-using std::atomic_schar;
-using std::atomic_uchar;
-using std::atomic_short;
-using std::atomic_ushort;
-using std::atomic_int;
-using std::atomic_uint;
-using std::atomic_long;
-using std::atomic_ulong;
-using std::atomic_llong;
-using std::atomic_ullong;
-using std::atomic_char16_t;
-using std::atomic_char32_t;
-using std::atomic_wchar_t;
-using std::atomic_int_least8_t;
-using std::atomic_uint_least8_t;
-using std::atomic_int_least16_t;
-using std::atomic_uint_least16_t;
-using std::atomic_int_least32_t;
-using std::atomic_uint_least32_t;
-using std::atomic_int_least64_t;
-using std::atomic_uint_least64_t;
-using std::atomic_int_fast8_t;
-using std::atomic_uint_fast8_t;
-using std::atomic_int_fast16_t;
-using std::atomic_uint_fast16_t;
-using std::atomic_int_fast32_t;
-using std::atomic_uint_fast32_t;
-using std::atomic_int_fast64_t;
-using std::atomic_uint_fast64_t;
-using std::atomic_intptr_t;
-using std::atomic_uintptr_t;
-using std::atomic_size_t;
-using std::atomic_ptrdiff_t;
-using std::atomic_intmax_t;
-using std::atomic_uintmax_t;
-
-#else /* <atomic> unavailable, possibly because this is C, not C++ */
-
-#include <sys/types.h>
-#include <stdbool.h>
-
-/*
- * C: Do it ourselves.
- * Note that the runtime representation defined here should be compatible
- * with the C++ one, i.e. an _Atomic(T) needs to contain the same
- * bits as a T.
- */
-
-#include <stddef.h>  /* For ptrdiff_t.                          */
-#include <stdint.h>  /* TODO: Should pollute namespace less.    */
-#if __STDC_VERSION__ >= 201112L
-# include <uchar.h>  /* For char16_t and char32_t.              */
-#endif
-
-#ifdef __clang__
-# if __has_extension(c_atomic) || __has_extension(cxx_atomic)
-#  define       __CLANG_ATOMICS
-# else
-#  error "stdatomic.h does not support your compiler"
-# endif
-# if __has_builtin(__sync_swap)
-#  define __HAS_BUILTIN_SYNC_SWAP
-# endif
-#else
-# if __GNUC_PREREQ(4, 7)
-#  define	__GNUC_ATOMICS
-# else
-#  define	__SYNC_ATOMICS
-#  ifdef __cplusplus
-#   define       __ATOMICS_AVOID_DOT_INIT
-#  endif
-# endif
-#endif
-
-/*
- * 7.17.1 Atomic lock-free macros.
- */
-
-#ifdef __GCC_ATOMIC_BOOL_LOCK_FREE
-#define	ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_BOOL_LOCK_FREE           2 /* For all modern platforms */
-#endif
-#ifdef __GCC_ATOMIC_CHAR_LOCK_FREE
-#define	ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_CHAR_LOCK_FREE           2
-#endif
-#ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define	ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_CHAR16_T_LOCK_FREE       2
-#endif
-#ifdef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define	ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_CHAR32_T_LOCK_FREE       2
-#endif
-#ifdef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define	ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_WCHAR_T_LOCK_FREE        2
-#endif
-#ifdef __GCC_ATOMIC_SHORT_LOCK_FREE
-#define	ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_SHORT_LOCK_FREE          2
-#endif
-#ifdef __GCC_ATOMIC_INT_LOCK_FREE
-#define	ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_INT_LOCK_FREE            2
-#endif
-#ifdef __GCC_ATOMIC_LONG_LOCK_FREE
-#define	ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_LONG_LOCK_FREE           2
-#endif
-#ifdef __GCC_ATOMIC_LLONG_LOCK_FREE
-#define	ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_LLONG_LOCK_FREE          1 /* maybe */
-#endif
-#ifdef __GCC_ATOMIC_POINTER_LOCK_FREE
-#define	ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
-#elif defined(__SYNC_ATOMICS)
-#define	ATOMIC_POINTER_LOCK_FREE        2
-#endif
-
-/*
- * 7.17.2 Initialization.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	ATOMIC_VAR_INIT(value)		(value)
-#define	atomic_init(obj, value)		__c11_atomic_init(obj, value)
-#else
-#ifdef __ATOMICS_AVOID_DOT_INIT
-#define	ATOMIC_VAR_INIT(value)		{ value }
-#else
-#define	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
-#endif
-#define	atomic_init(obj, value)		((void)((obj)->__val = (value)))
-#endif
-
-/*
- * Clang and recent GCC both provide predefined macros for the memory
- * orderings.  If we are using a compiler that doesn't define them, use the
- * clang values - these will be ignored in the fallback path.
- */
-
-#ifndef __ATOMIC_RELAXED
-#define __ATOMIC_RELAXED		0
-#endif
-#ifndef __ATOMIC_CONSUME
-#define __ATOMIC_CONSUME		1
-#endif
-#ifndef __ATOMIC_ACQUIRE
-#define __ATOMIC_ACQUIRE		2
-#endif
-#ifndef __ATOMIC_RELEASE
-#define __ATOMIC_RELEASE		3
-#endif
-#ifndef __ATOMIC_ACQ_REL
-#define __ATOMIC_ACQ_REL		4
-#endif
-#ifndef __ATOMIC_SEQ_CST
-#define __ATOMIC_SEQ_CST		5
-#endif
-
-/*
- * 7.17.3 Order and consistency.
- *
- * The memory_order_* constants that denote the barrier behaviour of the
- * atomic operations.
- * The enum values must be identical to those used by the
- * C++ <atomic> header.
- */
-
-typedef enum {
-	memory_order_relaxed = __ATOMIC_RELAXED,
-	memory_order_consume = __ATOMIC_CONSUME,
-	memory_order_acquire = __ATOMIC_ACQUIRE,
-	memory_order_release = __ATOMIC_RELEASE,
-	memory_order_acq_rel = __ATOMIC_ACQ_REL,
-	memory_order_seq_cst = __ATOMIC_SEQ_CST
-} memory_order;
-
-/*
- * 7.17.4 Fences.
- */
-
-static __inline void
-atomic_thread_fence(memory_order __order __attribute__((unused)))
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_thread_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_thread_fence(__order);
-#else
-	__sync_synchronize();
-#endif
-}
-
-static __inline void
-atomic_signal_fence(memory_order __order __attribute__((unused)))
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_signal_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_signal_fence(__order);
-#else
-	__asm volatile ("" ::: "memory");
-#endif
-}
-
-/*
- * 7.17.5 Lock-free property.
- */
-
-#if defined(_KERNEL)
-/* Atomics in kernelspace are always lock-free. */
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), (_Bool)1)
-#elif defined(__CLANG_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__c11_atomic_is_lock_free(sizeof(*(obj)))
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
-#else
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
-#endif
-
-/*
- * 7.17.6 Atomic integer types.
- */
-
-#ifndef __CLANG_ATOMICS
-/*
- * No native support for _Atomic(). Place object in structure to prevent
- * most forms of direct non-atomic access.
- */
-#define _Atomic(T)              struct { T volatile __val; }
-#endif
-
-typedef _Atomic(bool)			atomic_bool;
-typedef _Atomic(char)			atomic_char;
-typedef _Atomic(signed char)		atomic_schar;
-typedef _Atomic(unsigned char)		atomic_uchar;
-typedef _Atomic(short)			atomic_short;
-typedef _Atomic(unsigned short)		atomic_ushort;
-typedef _Atomic(int)			atomic_int;
-typedef _Atomic(unsigned int)		atomic_uint;
-typedef _Atomic(long)			atomic_long;
-typedef _Atomic(unsigned long)		atomic_ulong;
-typedef _Atomic(long long)		atomic_llong;
-typedef _Atomic(unsigned long long)	atomic_ullong;
-#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
-  typedef _Atomic(char16_t)		atomic_char16_t;
-  typedef _Atomic(char32_t)		atomic_char32_t;
-#endif
-typedef _Atomic(wchar_t)		atomic_wchar_t;
-typedef _Atomic(int_least8_t)		atomic_int_least8_t;
-typedef _Atomic(uint_least8_t)	atomic_uint_least8_t;
-typedef _Atomic(int_least16_t)	atomic_int_least16_t;
-typedef _Atomic(uint_least16_t)	atomic_uint_least16_t;
-typedef _Atomic(int_least32_t)	atomic_int_least32_t;
-typedef _Atomic(uint_least32_t)	atomic_uint_least32_t;
-typedef _Atomic(int_least64_t)	atomic_int_least64_t;
-typedef _Atomic(uint_least64_t)	atomic_uint_least64_t;
-typedef _Atomic(int_fast8_t)		atomic_int_fast8_t;
-typedef _Atomic(uint_fast8_t)		atomic_uint_fast8_t;
-typedef _Atomic(int_fast16_t)		atomic_int_fast16_t;
-typedef _Atomic(uint_fast16_t)	atomic_uint_fast16_t;
-typedef _Atomic(int_fast32_t)		atomic_int_fast32_t;
-typedef _Atomic(uint_fast32_t)	atomic_uint_fast32_t;
-typedef _Atomic(int_fast64_t)		atomic_int_fast64_t;
-typedef _Atomic(uint_fast64_t)	atomic_uint_fast64_t;
-typedef _Atomic(intptr_t)		atomic_intptr_t;
-typedef _Atomic(uintptr_t)		atomic_uintptr_t;
-typedef _Atomic(size_t)		atomic_size_t;
-typedef _Atomic(ptrdiff_t)		atomic_ptrdiff_t;
-typedef _Atomic(intmax_t)		atomic_intmax_t;
-typedef _Atomic(uintmax_t)		atomic_uintmax_t;
-
-/*
- * 7.17.7 Operations on atomic types.
- */
-
-/*
- * Compiler-specific operations.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
-	    success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
-	    success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__c11_atomic_exchange(object, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__c11_atomic_fetch_add(object, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__c11_atomic_fetch_and(object, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__c11_atomic_fetch_or(object, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__c11_atomic_fetch_sub(object, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__c11_atomic_fetch_xor(object, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__c11_atomic_load(object, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__c11_atomic_store(object, desired, order)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 0, success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 1, success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__atomic_exchange_n(&(object)->__val, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__atomic_fetch_add(&(object)->__val, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__atomic_fetch_and(&(object)->__val, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__atomic_fetch_or(&(object)->__val, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__atomic_fetch_sub(&(object)->__val, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__atomic_fetch_xor(&(object)->__val, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__atomic_load_n(&(object)->__val, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__atomic_store_n(&(object)->__val, desired, order)
-#else
-#define	__atomic_apply_stride(object, operand) \
-	(((__typeof__((object)->__val))0) + (operand))
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)	__extension__ ({			\
-	__typeof__(expected) __ep = (expected);				\
-	__typeof__(*__ep) __e = *__ep;					\
-	(void)(success); (void)(failure);				\
-	(bool)((*__ep = __sync_val_compare_and_swap(&(object)->__val,	\
-	    __e, desired)) == __e);					\
-})
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-		desired, success, failure)
-#ifdef __HAS_BUILTIN_SYNC_SWAP
-/* Clang provides a full-barrier atomic exchange - use it if available. */
-#define	atomic_exchange_explicit(object, desired, order)		\
-	((void)(order), __sync_swap(&(object)->__val, desired))
-#else
-/*
- * __sync_lock_test_and_set() is only an acquire barrier in theory (although in
- * practice it is usually a full barrier) so we need an explicit barrier before
- * it.
- */
-#define	atomic_exchange_explicit(object, desired, order)		\
-__extension__ ({							\
-	__typeof__(object) __o = (object);				\
-	__typeof__(desired) __d = (desired);				\
-	(void)(order);							\
-	__sync_synchronize();						\
-	__sync_lock_test_and_set(&(__o)->__val, __d);			\
-})
-#endif
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_add(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_and(&(object)->__val, operand))
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_or(&(object)->__val, operand))
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_sub(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_xor(&(object)->__val, operand))
-#define	atomic_load_explicit(object, order)				\
-	((void)(order), __sync_fetch_and_add(&(object)->__val, 0))
-#define	atomic_store_explicit(object, desired, order)			\
-	((void)atomic_exchange_explicit(object, desired, order))
-#endif
-
-/*
- * Convenience functions.
- *
- * Don't provide these in kernel space. In kernel space, we should be
- * disciplined enough to always provide explicit barriers.
- */
-
-#ifndef _KERNEL
-#define	atomic_compare_exchange_strong(object, expected, desired)	\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_compare_exchange_weak(object, expected, desired)		\
-	atomic_compare_exchange_weak_explicit(object, expected,		\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_exchange(object, desired)				\
-	atomic_exchange_explicit(object, desired, memory_order_seq_cst)
-#define	atomic_fetch_add(object, operand)				\
-	atomic_fetch_add_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_and(object, operand)				\
-	atomic_fetch_and_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_or(object, operand)				\
-	atomic_fetch_or_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_sub(object, operand)				\
-	atomic_fetch_sub_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_xor(object, operand)				\
-	atomic_fetch_xor_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_load(object)						\
-	atomic_load_explicit(object, memory_order_seq_cst)
-#define	atomic_store(object, desired)					\
-	atomic_store_explicit(object, desired, memory_order_seq_cst)
-#endif /* !_KERNEL */
-
-/*
- * 7.17.8 Atomic flag type and operations.
- *
- * XXX: Assume atomic_bool can be used as an atomic_flag. Is there some
- * kind of compiler built-in type we could use?
- */
-
-typedef struct {
-	atomic_bool	__flag;
-} atomic_flag;
-
-#define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(false) }
-
-static __inline bool
-atomic_flag_test_and_set_explicit(volatile atomic_flag *__object,
-    memory_order __order)
-{
-	return (atomic_exchange_explicit(&__object->__flag, 1, __order));
-}
-
-static __inline void
-atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order)
-{
-
-	atomic_store_explicit(&__object->__flag, 0, __order);
-}
-
-#ifndef _KERNEL
-static __inline bool
-atomic_flag_test_and_set(volatile atomic_flag *__object)
-{
-
-	return (atomic_flag_test_and_set_explicit(__object,
-	    memory_order_seq_cst));
-}
-
-static __inline void
-atomic_flag_clear(volatile atomic_flag *__object)
-{
-
-	atomic_flag_clear_explicit(__object, memory_order_seq_cst);
-}
-#endif /* !_KERNEL */
-
-#endif /* <atomic> unavailable */
-
-#endif /* !_STDATOMIC_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h b/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h
deleted file mode 100644
index a0f017c..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/stdlib.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _STDLIB_H_
-#define _STDLIB_H_
-
-#include <sys/cdefs.h>
-
-#include <stddef.h>
-#include <string.h>
-#include <alloca.h>
-#include <strings.h>
-#include <memory.h>
-
-__BEGIN_DECLS
-
-#define EXIT_FAILURE 1
-#define EXIT_SUCCESS 0
-
-extern __noreturn void abort(void);
-extern __noreturn void exit(int);
-extern __noreturn void _Exit(int);
-extern int atexit(void (*)(void));
-
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-int at_quick_exit(void (*)(void));
-void quick_exit(int) __noreturn;
-#endif
-
-extern char* getenv(const char*);
-extern int putenv(char*);
-extern int setenv(const char*, const char*, int);
-extern int unsetenv(const char*);
-extern int clearenv(void);
-
-extern char* mkdtemp(char*);
-extern char* mktemp(char*) __warnattr("mktemp possibly used unsafely; consider using mkstemp");
-extern int mkstemp(char*);
-extern int mkstemp64(char*);
-
-extern long strtol(const char *, char **, int);
-extern long long strtoll(const char *, char **, int);
-extern unsigned long strtoul(const char *, char **, int);
-extern unsigned long long strtoull(const char *, char **, int);
-
-extern int posix_memalign(void **memptr, size_t alignment, size_t size);
-
-extern double atof(const char*) __NDK_FPABI__;
-
-extern double strtod(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern float strtof(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-
-extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-
-extern int atoi(const char*) __purefunc;
-extern long atol(const char*) __purefunc;
-extern long long atoll(const char*) __purefunc;
-
-extern int abs(int) __pure2;
-extern long labs(long) __pure2;
-extern long long llabs(long long) __pure2;
-
-extern char * realpath(const char *path, char *resolved);
-extern int system(const char * string);
-
-extern void * bsearch(const void *key, const void *base0,
-	size_t nmemb, size_t size,
-	int (*compar)(const void *, const void *));
-
-extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
-
-extern long jrand48(unsigned short *);
-extern long mrand48(void);
-extern long nrand48(unsigned short *);
-extern long lrand48(void);
-extern unsigned short *seed48(unsigned short*);
-extern double erand48(unsigned short xsubi[3]) __NDK_FPABI__;
-extern double drand48(void) __NDK_FPABI__;
-extern void srand48(long);
-
-unsigned int arc4random(void);
-unsigned int arc4random_uniform(unsigned int);
-void arc4random_buf(void*, size_t);
-
-#define RAND_MAX 0x7fffffff
-
-int rand(void);
-int rand_r(unsigned int*);
-void srand(unsigned int);
-
-char* initstate(unsigned int, char*, size_t);
-long random(void);
-char* setstate(char*);
-void srandom(unsigned int);
-
-int getpt(void);
-int grantpt(int);
-int posix_openpt(int);
-char* ptsname(int) __warnattr("ptsname is not thread-safe; use ptsname_r instead");
-int ptsname_r(int, char*, size_t);
-int unlockpt(int);
-
-typedef struct {
-    int  quot;
-    int  rem;
-} div_t;
-
-extern div_t   div(int, int) __pure2;
-
-typedef struct {
-    long int  quot;
-    long int  rem;
-} ldiv_t;
-
-extern ldiv_t   ldiv(long, long) __pure2;
-
-typedef struct {
-    long long int  quot;
-    long long int  rem;
-} lldiv_t;
-
-extern lldiv_t   lldiv(long long, long long) __pure2;
-
-/* BSD compatibility. */
-extern const char* getprogname(void);
-extern void setprogname(const char*);
-
-/* make STLPort happy */
-extern int      mblen(const char *, size_t);
-extern size_t   mbstowcs(wchar_t *, const char *, size_t);
-extern int      mbtowc(wchar_t *, const char *, size_t);
-
-/* Likewise, make libstdc++-v3 happy.  */
-extern int	wctomb(char *, wchar_t);
-extern size_t	wcstombs(char *, const wchar_t *, size_t);
-
-extern size_t __ctype_get_mb_cur_max(void);
-#define MB_CUR_MAX __ctype_get_mb_cur_max()
-
-__END_DECLS
-
-#endif /* _STDLIB_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/time.h b/9/platforms/android-19/arch-x86_64/usr/include/time.h
deleted file mode 100644
index 0a5f18b..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/time.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _TIME_H_
-#define _TIME_H_
-
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <xlocale.h>
-
-__BEGIN_DECLS
-
-#define CLOCKS_PER_SEC 1000000
-
-extern char* tzname[] __LIBC_ABI_PUBLIC__;
-extern int daylight __LIBC_ABI_PUBLIC__;
-extern long int timezone __LIBC_ABI_PUBLIC__;
-
-struct sigevent;
-
-struct tm {
-  int tm_sec;
-  int tm_min;
-  int tm_hour;
-  int tm_mday;
-  int tm_mon;
-  int tm_year;
-  int tm_wday;
-  int tm_yday;
-  int tm_isdst;
-  long int tm_gmtoff;
-  const char* tm_zone;
-};
-
-#define TM_ZONE tm_zone
-
-extern time_t time(time_t*) __LIBC_ABI_PUBLIC__;
-extern int nanosleep(const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
-
-extern char* asctime(const struct tm*) __LIBC_ABI_PUBLIC__;
-extern char* asctime_r(const struct tm*, char*) __LIBC_ABI_PUBLIC__;
-
-extern double difftime(time_t, time_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern time_t mktime(struct tm*) __LIBC_ABI_PUBLIC__;
-
-extern struct tm* localtime(const time_t*) __LIBC_ABI_PUBLIC__;
-extern struct tm* localtime_r(const time_t*, struct tm*) __LIBC_ABI_PUBLIC__;
-
-extern struct tm* gmtime(const time_t*) __LIBC_ABI_PUBLIC__;
-extern struct tm* gmtime_r(const time_t*, struct tm*) __LIBC_ABI_PUBLIC__;
-
-extern char* strptime(const char*, const char*, struct tm*) __LIBC_ABI_PUBLIC__;
-extern size_t strftime(char*, size_t, const char*, const struct tm*) __LIBC_ABI_PUBLIC__;
-extern size_t strftime_l(char *, size_t, const char *, const struct tm *, locale_t) __LIBC_ABI_PUBLIC__;
-
-extern char* ctime(const time_t*) __LIBC_ABI_PUBLIC__;
-extern char* ctime_r(const time_t*, char*) __LIBC_ABI_PUBLIC__;
-
-extern void tzset(void) __LIBC_ABI_PUBLIC__;
-
-extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
-
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-
-extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
-extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
-extern int timer_settime(timer_t, int, const struct itimerspec*, struct itimerspec*) __LIBC_ABI_PUBLIC__;
-extern int timer_gettime(timer_t, struct itimerspec*) __LIBC_ABI_PUBLIC__;
-extern int timer_getoverrun(timer_t) __LIBC_ABI_PUBLIC__;
-
-/* Non-standard extensions that are in the BSDs and glibc. */
-extern time_t timelocal(struct tm*) __LIBC_ABI_PUBLIC__;
-extern time_t timegm(struct tm*) __LIBC_ABI_PUBLIC__;
-
-__END_DECLS
-
-#endif /* _TIME_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/wchar.h b/9/platforms/android-19/arch-x86_64/usr/include/wchar.h
deleted file mode 100644
index f421d4c..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/include/wchar.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _WCHAR_H_
-#define _WCHAR_H_
-
-#include <sys/cdefs.h>
-#include <stdio.h>
-
-#include <stdarg.h>
-#include <stddef.h>
-#include <time.h>
-
-#include <machine/wchar_limits.h>
-
-__BEGIN_DECLS
-
-typedef __WINT_TYPE__  wint_t;
-typedef struct {
-  uint8_t __seq[4];
-#ifdef __LP64__
-  char __reserved[4];
-#endif
-} mbstate_t;
-
-enum {
-    WC_TYPE_INVALID = 0,
-    WC_TYPE_ALNUM,
-    WC_TYPE_ALPHA,
-    WC_TYPE_BLANK,
-    WC_TYPE_CNTRL,
-    WC_TYPE_DIGIT,
-    WC_TYPE_GRAPH,
-    WC_TYPE_LOWER,
-    WC_TYPE_PRINT,
-    WC_TYPE_PUNCT,
-    WC_TYPE_SPACE,
-    WC_TYPE_UPPER,
-    WC_TYPE_XDIGIT,
-    WC_TYPE_MAX
-};
-
-typedef long wctype_t;
-
-#define  WEOF        ((wint_t)(-1))
-
-extern wint_t            btowc(int);
-extern int               fwprintf(FILE *, const wchar_t *, ...);
-extern int               fwscanf(FILE *, const wchar_t *, ...);
-extern int               iswalnum(wint_t);
-extern int               iswalpha(wint_t);
-extern int               iswblank(wint_t);
-extern int               iswcntrl(wint_t);
-extern int               iswdigit(wint_t);
-extern int               iswgraph(wint_t);
-extern int               iswlower(wint_t);
-extern int               iswprint(wint_t);
-extern int               iswpunct(wint_t);
-extern int               iswspace(wint_t);
-extern int               iswupper(wint_t);
-extern int               iswxdigit(wint_t);
-extern int               iswctype(wint_t, wctype_t);
-extern wint_t            fgetwc(FILE *);
-extern wchar_t          *fgetws(wchar_t *, int, FILE *);
-extern wint_t            fputwc(wchar_t, FILE *);
-extern int               fputws(const wchar_t *, FILE *);
-extern int               fwide(FILE *, int);
-extern wint_t            getwc(FILE *);
-extern wint_t            getwchar(void);
-extern int               mbsinit(const mbstate_t *);
-extern size_t            mbrlen(const char *, size_t, mbstate_t *);
-extern size_t            mbrtowc(wchar_t *, const char *, size_t, mbstate_t *);
-extern size_t mbsrtowcs(wchar_t*, const char**, size_t, mbstate_t*);
-extern size_t mbsnrtowcs(wchar_t*, const char**, size_t, size_t, mbstate_t*);
-extern size_t            mbstowcs(wchar_t *, const char *, size_t);
-extern wint_t            putwc(wchar_t, FILE *);
-extern wint_t            putwchar(wchar_t);
-extern int               swprintf(wchar_t *, size_t, const wchar_t *, ...);
-extern int               swscanf(const wchar_t *, const wchar_t *, ...);
-extern wint_t            towlower(wint_t);
-extern wint_t            towupper(wint_t);
-extern wint_t            ungetwc(wint_t, FILE *);
-extern int vfwprintf(FILE*, const wchar_t*, va_list);
-extern int vfwscanf(FILE*, const wchar_t*, va_list);
-extern int vswprintf(wchar_t*, size_t, const wchar_t*, va_list);
-extern int vswscanf(const wchar_t*, const wchar_t*, va_list);
-extern int vwprintf(const wchar_t*, va_list);
-extern int vwscanf(const wchar_t*, va_list);
-extern size_t            wcrtomb(char *, wchar_t, mbstate_t *);
-extern int               wcscasecmp(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcscat(wchar_t *, const wchar_t *);
-extern wchar_t          *wcschr(const wchar_t *, wchar_t);
-extern int               wcscmp(const wchar_t *, const wchar_t *);
-extern int               wcscoll(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcscpy(wchar_t *, const wchar_t *);
-extern size_t            wcscspn(const wchar_t *, const wchar_t *);
-extern size_t            wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm *) __LIBC_ABI_PUBLIC__;
-extern size_t            wcslen(const wchar_t *);
-extern int               wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wcsncat(wchar_t *, const wchar_t *, size_t);
-extern int               wcsncmp(const wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wcsncpy(wchar_t *, const wchar_t *, size_t);
-extern size_t wcsnrtombs(char*, const wchar_t**, size_t, size_t, mbstate_t*);
-extern wchar_t          *wcspbrk(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcsrchr(const wchar_t *, wchar_t);
-extern size_t wcsrtombs(char*, const wchar_t**, size_t, mbstate_t*);
-extern size_t            wcsspn(const wchar_t *, const wchar_t *);
-extern wchar_t          *wcsstr(const wchar_t *, const wchar_t *);
-extern double wcstod(const wchar_t*, wchar_t**) __NDK_FPABI__;
-extern float wcstof(const wchar_t*, wchar_t**) __NDK_FPABI__;
-extern wchar_t* wcstok(wchar_t*, const wchar_t*, wchar_t**);
-extern long wcstol(const wchar_t*, wchar_t**, int);
-extern long long wcstoll(const wchar_t*, wchar_t**, int);
-extern long double wcstold(const wchar_t*, wchar_t**) __NDK_FPABI__;
-extern unsigned long wcstoul(const wchar_t*, wchar_t**, int);
-extern unsigned long long wcstoull(const wchar_t*, wchar_t**, int);
-extern int               wcswidth(const wchar_t *, size_t);
-extern size_t            wcsxfrm(wchar_t *, const wchar_t *, size_t);
-extern int               wctob(wint_t);
-extern wctype_t          wctype(const char *);
-extern int               wcwidth(wchar_t);
-extern wchar_t          *wmemchr(const wchar_t *, wchar_t, size_t);
-extern int               wmemcmp(const wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wmemcpy(wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wmemmove(wchar_t *, const wchar_t *, size_t);
-extern wchar_t          *wmemset(wchar_t *, wchar_t, size_t);
-extern int               wprintf(const wchar_t *, ...);
-extern int               wscanf(const wchar_t *, ...);
-
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
-
-extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
-extern size_t wcsxfrm_l(wchar_t *, const wchar_t *, size_t, locale_t);
-
-extern size_t wcslcat(wchar_t*, const wchar_t*, size_t);
-extern size_t wcslcpy(wchar_t*, const wchar_t*, size_t);
-
-typedef void *wctrans_t;
-extern wint_t towctrans(wint_t, wctrans_t);
-extern wctrans_t wctrans(const char*);
-
-#if __POSIX_VISIBLE >= 200809
-wchar_t* wcsdup(const wchar_t*);
-size_t wcsnlen(const wchar_t*, size_t);
-#endif
-
-__END_DECLS
-
-#endif /* _WCHAR_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o
deleted file mode 100644
index 8b98275..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o
deleted file mode 100644
index 3772320..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o
deleted file mode 100644
index 8b98275..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so
deleted file mode 100755
index e5fdaea..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
deleted file mode 100644
index 92d47c8..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
deleted file mode 100644
index 7e5b8c2..0000000
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a
+++ /dev/null
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h b/9/platforms/android-21/arch-arm/usr/include/EGL/egl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h
copy to 9/platforms/android-21/arch-arm/usr/include/EGL/egl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h b/9/platforms/android-21/arch-arm/usr/include/EGL/eglext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h
copy to 9/platforms/android-21/arch-arm/usr/include/EGL/eglext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h b/9/platforms/android-21/arch-arm/usr/include/EGL/eglplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h
copy to 9/platforms/android-21/arch-arm/usr/include/EGL/eglplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h b/9/platforms/android-21/arch-arm/usr/include/GLES/gl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES/gl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h b/9/platforms/android-21/arch-arm/usr/include/GLES/glext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES/glext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h b/9/platforms/android-21/arch-arm/usr/include/GLES/glplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES/glplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h b/9/platforms/android-21/arch-arm/usr/include/GLES2/gl2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES2/gl2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h b/9/platforms/android-21/arch-arm/usr/include/GLES2/gl2ext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES2/gl2ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h b/9/platforms/android-21/arch-arm/usr/include/GLES2/gl2platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES2/gl2platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h b/9/platforms/android-21/arch-arm/usr/include/GLES3/gl3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES3/gl3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h b/9/platforms/android-21/arch-arm/usr/include/GLES3/gl31.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES3/gl31.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h b/9/platforms/android-21/arch-arm/usr/include/GLES3/gl3ext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES3/gl3ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h b/9/platforms/android-21/arch-arm/usr/include/GLES3/gl3platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h
copy to 9/platforms/android-21/arch-arm/usr/include/GLES3/gl3platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h b/9/platforms/android-21/arch-arm/usr/include/KHR/khrplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h
copy to 9/platforms/android-21/arch-arm/usr/include/KHR/khrplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h b/9/platforms/android-21/arch-arm/usr/include/OMXAL/OpenMAXAL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h
copy to 9/platforms/android-21/arch-arm/usr/include/OMXAL/OpenMAXAL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-21/arch-arm/usr/include/OMXAL/OpenMAXAL_Android.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h
copy to 9/platforms/android-21/arch-arm/usr/include/OMXAL/OpenMAXAL_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h b/9/platforms/android-21/arch-arm/usr/include/OMXAL/OpenMAXAL_Platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h
copy to 9/platforms/android-21/arch-arm/usr/include/OMXAL/OpenMAXAL_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h b/9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h
copy to 9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_Android.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h
copy to 9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h b/9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
copy to 9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h b/9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h
copy to 9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h b/9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_Platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h
copy to 9/platforms/android-21/arch-arm/usr/include/SLES/OpenSLES_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/alloca.h b/9/platforms/android-21/arch-arm/usr/include/alloca.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/alloca.h
copy to 9/platforms/android-21/arch-arm/usr/include/alloca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h b/9/platforms/android-21/arch-arm/usr/include/android/api-level.h
similarity index 97%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
rename to 9/platforms/android-21/arch-arm/usr/include/android/api-level.h
index 9e9c3d6..649efd6 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
+++ b/9/platforms/android-21/arch-arm/usr/include/android/api-level.h
@@ -28,6 +28,6 @@
 #ifndef ANDROID_API_LEVEL_H
 #define ANDROID_API_LEVEL_H
 
-#define __ANDROID_API__ 19
+#define __ANDROID_API__ 21
 
 #endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h b/9/platforms/android-21/arch-arm/usr/include/android/asset_manager.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/asset_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h b/9/platforms/android-21/arch-arm/usr/include/android/asset_manager_jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/asset_manager_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h b/9/platforms/android-21/arch-arm/usr/include/android/bitmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/configuration.h b/9/platforms/android-21/arch-arm/usr/include/android/configuration.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/configuration.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/configuration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h b/9/platforms/android-21/arch-arm/usr/include/android/dlext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/dlext.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/dlext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/input.h b/9/platforms/android-21/arch-arm/usr/include/android/input.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/input.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/input.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h b/9/platforms/android-21/arch-arm/usr/include/android/keycodes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/keycodes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/log.h b/9/platforms/android-21/arch-arm/usr/include/android/log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/log.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/looper.h b/9/platforms/android-21/arch-arm/usr/include/android/looper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/looper.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/looper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h b/9/platforms/android-21/arch-arm/usr/include/android/native_activity.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/native_activity.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window.h b/9/platforms/android-21/arch-arm/usr/include/android/native_window.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_window.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/native_window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h b/9/platforms/android-21/arch-arm/usr/include/android/native_window_jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/native_window_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/obb.h b/9/platforms/android-21/arch-arm/usr/include/android/obb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/obb.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/obb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/rect.h b/9/platforms/android-21/arch-arm/usr/include/android/rect.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/rect.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/rect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/sensor.h b/9/platforms/android-21/arch-arm/usr/include/android/sensor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/sensor.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/sensor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h b/9/platforms/android-21/arch-arm/usr/include/android/storage_manager.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/storage_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/tts.h b/9/platforms/android-21/arch-arm/usr/include/android/tts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/tts.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/tts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/window.h b/9/platforms/android-21/arch-arm/usr/include/android/window.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/window.h
copy to 9/platforms/android-21/arch-arm/usr/include/android/window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ar.h b/9/platforms/android-21/arch-arm/usr/include/ar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ar.h
copy to 9/platforms/android-21/arch-arm/usr/include/ar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h b/9/platforms/android-21/arch-arm/usr/include/arpa/inet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
copy to 9/platforms/android-21/arch-arm/usr/include/arpa/inet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h b/9/platforms/android-21/arch-arm/usr/include/arpa/nameser.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h
copy to 9/platforms/android-21/arch-arm/usr/include/arpa/nameser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h b/9/platforms/android-21/arch-arm/usr/include/arpa/nameser_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h
copy to 9/platforms/android-21/arch-arm/usr/include/arpa/nameser_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h b/9/platforms/android-21/arch-arm/usr/include/arpa/telnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h
copy to 9/platforms/android-21/arch-arm/usr/include/arpa/telnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/bitsperlong.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/bitsperlong.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/errno-base.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/errno-base.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/int-l64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/int-l64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/int-ll64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/int-ll64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/ipcbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/ipcbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/mman-common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/mman-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/msgbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/msgbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/sembuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/sembuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/setup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/setup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/shmbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/shmbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/shmparam.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/shmparam.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/siginfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/siginfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/signal-defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/signal-defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/termbits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h b/9/platforms/android-21/arch-arm/usr/include/asm-generic/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm-generic/unistd.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/a.out.h b/9/platforms/android-21/arch-arm/usr/include/asm/a.out.h
new file mode 100644
index 0000000..54b30ac
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/a.out.h
@@ -0,0 +1,48 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef __ARM_A_OUT_H__
+#define __ARM_A_OUT_H__
+#include <linux/personality.h>
+#include <linux/types.h>
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct exec
+{
+ __u32 a_info;
+ __u32 a_text;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u32 a_data;
+ __u32 a_bss;
+ __u32 a_syms;
+ __u32 a_entry;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u32 a_trsize;
+ __u32 a_drsize;
+};
+#define N_TXTADDR(a) (0x00008000)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define N_TRSIZE(a) ((a).a_trsize)
+#define N_DRSIZE(a) ((a).a_drsize)
+#define N_SYMSIZE(a) ((a).a_syms)
+#define M_ARM 103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#ifndef LIBRARY_START_TEXT
+#define LIBRARY_START_TEXT (0x00c00000)
+#endif
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/auxvec.h b/9/platforms/android-21/arch-arm/usr/include/asm/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/auxvec.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/auxvec.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/bitsperlong.h b/9/platforms/android-21/arch-arm/usr/include/asm/bitsperlong.h
new file mode 100644
index 0000000..5dc5060
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/bitsperlong.h
@@ -0,0 +1,19 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#include <asm-generic/bitsperlong.h>
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/byteorder.h b/9/platforms/android-21/arch-arm/usr/include/asm/byteorder.h
new file mode 100644
index 0000000..6f17a48
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/byteorder.h
@@ -0,0 +1,23 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef __ASM_ARM_BYTEORDER_H
+#define __ASM_ARM_BYTEORDER_H
+#include <linux/byteorder/little_endian.h>
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/errno.h b/9/platforms/android-21/arch-arm/usr/include/asm/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/errno.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/errno.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/fcntl.h b/9/platforms/android-21/arch-arm/usr/include/asm/fcntl.h
new file mode 100644
index 0000000..995d145
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/fcntl.h
@@ -0,0 +1,28 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _ARM_FCNTL_H
+#define _ARM_FCNTL_H
+#define O_DIRECTORY 040000
+#define O_NOFOLLOW 0100000
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define O_DIRECT 0200000
+#define O_LARGEFILE 0400000
+#include <asm-generic/fcntl.h>
+#endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/hwcap.h b/9/platforms/android-21/arch-arm/usr/include/asm/hwcap.h
new file mode 100644
index 0000000..e70f3b8
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/hwcap.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _UAPI__ASMARM_HWCAP_H
+#define _UAPI__ASMARM_HWCAP_H
+#define HWCAP_SWP (1 << 0)
+#define HWCAP_HALF (1 << 1)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define HWCAP_THUMB (1 << 2)
+#define HWCAP_26BIT (1 << 3)
+#define HWCAP_FAST_MULT (1 << 4)
+#define HWCAP_FPA (1 << 5)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define HWCAP_VFP (1 << 6)
+#define HWCAP_EDSP (1 << 7)
+#define HWCAP_JAVA (1 << 8)
+#define HWCAP_IWMMXT (1 << 9)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define HWCAP_CRUNCH (1 << 10)
+#define HWCAP_THUMBEE (1 << 11)
+#define HWCAP_NEON (1 << 12)
+#define HWCAP_VFPv3 (1 << 13)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define HWCAP_VFPv3D16 (1 << 14)
+#define HWCAP_TLS (1 << 15)
+#define HWCAP_VFPv4 (1 << 16)
+#define HWCAP_IDIVA (1 << 17)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define HWCAP_IDIVT (1 << 18)
+#define HWCAP_VFPD32 (1 << 19)
+#define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)
+#define HWCAP_LPAE (1 << 20)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define HWCAP_EVTSTRM (1 << 21)
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ioctl.h b/9/platforms/android-21/arch-arm/usr/include/asm/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/ioctl.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/ioctls.h b/9/platforms/android-21/arch-arm/usr/include/asm/ioctls.h
new file mode 100644
index 0000000..2c59181
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/ioctls.h
@@ -0,0 +1,24 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef __ASM_ARM_IOCTLS_H
+#define __ASM_ARM_IOCTLS_H
+#define FIOQSIZE 0x545E
+#include <asm-generic/ioctls.h>
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h b/9/platforms/android-21/arch-arm/usr/include/asm/ipcbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/ipcbuf.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/kvm.h b/9/platforms/android-21/arch-arm/usr/include/asm/kvm.h
new file mode 100644
index 0000000..2b5a17e
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/kvm.h
@@ -0,0 +1,180 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef __ARM_KVM_H__
+#define __ARM_KVM_H__
+#include <linux/types.h>
+#include <asm/ptrace.h>
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __KVM_HAVE_GUEST_DEBUG
+#define __KVM_HAVE_IRQ_LINE
+#define KVM_REG_SIZE(id)   (1U << (((id) & KVM_REG_SIZE_MASK) >> KVM_REG_SIZE_SHIFT))
+#define KVM_ARM_SVC_sp svc_regs[0]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_SVC_lr svc_regs[1]
+#define KVM_ARM_SVC_spsr svc_regs[2]
+#define KVM_ARM_ABT_sp abt_regs[0]
+#define KVM_ARM_ABT_lr abt_regs[1]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_ABT_spsr abt_regs[2]
+#define KVM_ARM_UND_sp und_regs[0]
+#define KVM_ARM_UND_lr und_regs[1]
+#define KVM_ARM_UND_spsr und_regs[2]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_IRQ_sp irq_regs[0]
+#define KVM_ARM_IRQ_lr irq_regs[1]
+#define KVM_ARM_IRQ_spsr irq_regs[2]
+#define KVM_ARM_FIQ_r8 fiq_regs[0]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_FIQ_r9 fiq_regs[1]
+#define KVM_ARM_FIQ_r10 fiq_regs[2]
+#define KVM_ARM_FIQ_fp fiq_regs[3]
+#define KVM_ARM_FIQ_ip fiq_regs[4]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_FIQ_sp fiq_regs[5]
+#define KVM_ARM_FIQ_lr fiq_regs[6]
+#define KVM_ARM_FIQ_spsr fiq_regs[7]
+struct kvm_regs {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ struct pt_regs usr_regs;
+ unsigned long svc_regs[3];
+ unsigned long abt_regs[3];
+ unsigned long und_regs[3];
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long irq_regs[3];
+ unsigned long fiq_regs[8];
+};
+#define KVM_ARM_TARGET_CORTEX_A15 0
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_TARGET_CORTEX_A7 1
+#define KVM_ARM_NUM_TARGETS 2
+#define KVM_ARM_DEVICE_TYPE_SHIFT 0
+#define KVM_ARM_DEVICE_TYPE_MASK (0xffff << KVM_ARM_DEVICE_TYPE_SHIFT)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_DEVICE_ID_SHIFT 16
+#define KVM_ARM_DEVICE_ID_MASK (0xffff << KVM_ARM_DEVICE_ID_SHIFT)
+#define KVM_ARM_DEVICE_VGIC_V2 0
+#define KVM_VGIC_V2_ADDR_TYPE_DIST 0
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_VGIC_V2_ADDR_TYPE_CPU 1
+#define KVM_VGIC_V2_DIST_SIZE 0x1000
+#define KVM_VGIC_V2_CPU_SIZE 0x2000
+#define KVM_ARM_VCPU_POWER_OFF 0
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct kvm_vcpu_init {
+ __u32 target;
+ __u32 features[7];
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct kvm_sregs {
+};
+struct kvm_fpu {
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct kvm_guest_debug_arch {
+};
+struct kvm_debug_exit_arch {
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct kvm_sync_regs {
+};
+struct kvm_arch_memory_slot {
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
+#define KVM_REG_ARM_COPROC_SHIFT 16
+#define KVM_REG_ARM_32_OPC2_MASK 0x0000000000000007
+#define KVM_REG_ARM_32_OPC2_SHIFT 0
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_OPC1_MASK 0x0000000000000078
+#define KVM_REG_ARM_OPC1_SHIFT 3
+#define KVM_REG_ARM_CRM_MASK 0x0000000000000780
+#define KVM_REG_ARM_CRM_SHIFT 7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_32_CRN_MASK 0x0000000000007800
+#define KVM_REG_ARM_32_CRN_SHIFT 11
+#define ARM_CP15_REG_SHIFT_MASK(x,n)   (((x) << KVM_REG_ARM_ ## n ## _SHIFT) & KVM_REG_ARM_ ## n ## _MASK)
+#define __ARM_CP15_REG(op1,crn,crm,op2)   (KVM_REG_ARM | (15 << KVM_REG_ARM_COPROC_SHIFT) |   ARM_CP15_REG_SHIFT_MASK(op1, OPC1) |   ARM_CP15_REG_SHIFT_MASK(crn, 32_CRN) |   ARM_CP15_REG_SHIFT_MASK(crm, CRM) |   ARM_CP15_REG_SHIFT_MASK(op2, 32_OPC2))
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ARM_CP15_REG32(...) (__ARM_CP15_REG(__VA_ARGS__) | KVM_REG_SIZE_U32)
+#define __ARM_CP15_REG64(op1,crm)   (__ARM_CP15_REG(op1, 0, crm, 0) | KVM_REG_SIZE_U64)
+#define ARM_CP15_REG64(...) __ARM_CP15_REG64(__VA_ARGS__)
+#define KVM_REG_ARM_TIMER_CTL ARM_CP15_REG32(0, 14, 3, 1)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_TIMER_CNT ARM_CP15_REG64(1, 14)
+#define KVM_REG_ARM_TIMER_CVAL ARM_CP15_REG64(3, 14)
+#define KVM_REG_ARM_CORE (0x0010 << KVM_REG_ARM_COPROC_SHIFT)
+#define KVM_REG_ARM_CORE_REG(name) (offsetof(struct kvm_regs, name) / 4)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_DEMUX (0x0011 << KVM_REG_ARM_COPROC_SHIFT)
+#define KVM_REG_ARM_DEMUX_ID_MASK 0x000000000000FF00
+#define KVM_REG_ARM_DEMUX_ID_SHIFT 8
+#define KVM_REG_ARM_DEMUX_ID_CCSIDR (0x00 << KVM_REG_ARM_DEMUX_ID_SHIFT)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_DEMUX_VAL_MASK 0x00000000000000FF
+#define KVM_REG_ARM_DEMUX_VAL_SHIFT 0
+#define KVM_REG_ARM_VFP (0x0012 << KVM_REG_ARM_COPROC_SHIFT)
+#define KVM_REG_ARM_VFP_MASK 0x000000000000FFFF
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_VFP_BASE_REG 0x0
+#define KVM_REG_ARM_VFP_FPSID 0x1000
+#define KVM_REG_ARM_VFP_FPSCR 0x1001
+#define KVM_REG_ARM_VFP_MVFR1 0x1006
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_REG_ARM_VFP_MVFR0 0x1007
+#define KVM_REG_ARM_VFP_FPEXC 0x1008
+#define KVM_REG_ARM_VFP_FPINST 0x1009
+#define KVM_REG_ARM_VFP_FPINST2 0x100A
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_DEV_ARM_VGIC_GRP_ADDR 0
+#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
+#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS 2
+#define KVM_DEV_ARM_VGIC_CPUID_SHIFT 32
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_DEV_ARM_VGIC_CPUID_MASK (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
+#define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0
+#define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
+#define KVM_ARM_IRQ_TYPE_SHIFT 24
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_IRQ_TYPE_MASK 0xff
+#define KVM_ARM_IRQ_VCPU_SHIFT 16
+#define KVM_ARM_IRQ_VCPU_MASK 0xff
+#define KVM_ARM_IRQ_NUM_SHIFT 0
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_IRQ_NUM_MASK 0xffff
+#define KVM_ARM_IRQ_TYPE_CPU 0
+#define KVM_ARM_IRQ_TYPE_SPI 1
+#define KVM_ARM_IRQ_TYPE_PPI 2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_ARM_IRQ_CPU_IRQ 0
+#define KVM_ARM_IRQ_CPU_FIQ 1
+#define KVM_ARM_IRQ_GIC_MAX 127
+#define KVM_PSCI_FN_BASE 0x95c1ba5e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_PSCI_FN(n) (KVM_PSCI_FN_BASE + (n))
+#define KVM_PSCI_FN_CPU_SUSPEND KVM_PSCI_FN(0)
+#define KVM_PSCI_FN_CPU_OFF KVM_PSCI_FN(1)
+#define KVM_PSCI_FN_CPU_ON KVM_PSCI_FN(2)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_PSCI_FN_MIGRATE KVM_PSCI_FN(3)
+#define KVM_PSCI_RET_SUCCESS 0
+#define KVM_PSCI_RET_NI ((unsigned long)-1)
+#define KVM_PSCI_RET_INVAL ((unsigned long)-2)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KVM_PSCI_RET_DENIED ((unsigned long)-3)
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/kvm_para.h b/9/platforms/android-21/arch-arm/usr/include/asm/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/kvm_para.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/kvm_para.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/mman.h b/9/platforms/android-21/arch-arm/usr/include/asm/mman.h
new file mode 100644
index 0000000..40f0e97
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/mman.h
@@ -0,0 +1,20 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#include <asm-generic/mman.h>
+#define arch_mmap_check(addr, len, flags)   (((flags) & MAP_FIXED && (addr) < FIRST_USER_ADDRESS) ? -EINVAL : 0)
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/msgbuf.h b/9/platforms/android-21/arch-arm/usr/include/asm/msgbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/msgbuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/msgbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/param.h b/9/platforms/android-21/arch-arm/usr/include/asm/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/param.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/param.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/perf_regs.h b/9/platforms/android-21/arch-arm/usr/include/asm/perf_regs.h
new file mode 100644
index 0000000..745bcf3
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/perf_regs.h
@@ -0,0 +1,45 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _ASM_ARM_PERF_REGS_H
+#define _ASM_ARM_PERF_REGS_H
+enum perf_event_arm_regs {
+ PERF_REG_ARM_R0,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ PERF_REG_ARM_R1,
+ PERF_REG_ARM_R2,
+ PERF_REG_ARM_R3,
+ PERF_REG_ARM_R4,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ PERF_REG_ARM_R5,
+ PERF_REG_ARM_R6,
+ PERF_REG_ARM_R7,
+ PERF_REG_ARM_R8,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ PERF_REG_ARM_R9,
+ PERF_REG_ARM_R10,
+ PERF_REG_ARM_FP,
+ PERF_REG_ARM_IP,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ PERF_REG_ARM_SP,
+ PERF_REG_ARM_LR,
+ PERF_REG_ARM_PC,
+ PERF_REG_ARM_MAX,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/poll.h b/9/platforms/android-21/arch-arm/usr/include/asm/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/poll.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/poll.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/posix_types.h b/9/platforms/android-21/arch-arm/usr/include/asm/posix_types.h
new file mode 100644
index 0000000..5e436e1
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/posix_types.h
@@ -0,0 +1,34 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef __ARCH_ARM_POSIX_TYPES_H
+#define __ARCH_ARM_POSIX_TYPES_H
+typedef unsigned short __kernel_mode_t;
+#define __kernel_mode_t __kernel_mode_t
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+typedef unsigned short __kernel_ipc_pid_t;
+#define __kernel_ipc_pid_t __kernel_ipc_pid_t
+typedef unsigned short __kernel_uid_t;
+typedef unsigned short __kernel_gid_t;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __kernel_uid_t __kernel_uid_t
+typedef unsigned short __kernel_old_dev_t;
+#define __kernel_old_dev_t __kernel_old_dev_t
+#include <asm-generic/posix_types.h>
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/ptrace.h b/9/platforms/android-21/arch-arm/usr/include/asm/ptrace.h
new file mode 100644
index 0000000..9d39d49
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/ptrace.h
@@ -0,0 +1,120 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _UAPI__ASM_ARM_PTRACE_H
+#define _UAPI__ASM_ARM_PTRACE_H
+#include <asm/hwcap.h>
+#define PTRACE_GETREGS 12
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PTRACE_SETREGS 13
+#define PTRACE_GETFPREGS 14
+#define PTRACE_SETFPREGS 15
+#define PTRACE_GETWMMXREGS 18
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PTRACE_SETWMMXREGS 19
+#define PTRACE_OLDSETOPTIONS 21
+#define PTRACE_GET_THREAD_AREA 22
+#define PTRACE_SET_SYSCALL 23
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PTRACE_GETCRUNCHREGS 25
+#define PTRACE_SETCRUNCHREGS 26
+#define PTRACE_GETVFPREGS 27
+#define PTRACE_SETVFPREGS 28
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PTRACE_GETHBPREGS 29
+#define PTRACE_SETHBPREGS 30
+#define USR26_MODE 0x00000000
+#define FIQ26_MODE 0x00000001
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define IRQ26_MODE 0x00000002
+#define SVC26_MODE 0x00000003
+#define USR_MODE 0x00000010
+#define SVC_MODE 0x00000013
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define FIQ_MODE 0x00000011
+#define IRQ_MODE 0x00000012
+#define ABT_MODE 0x00000017
+#define HYP_MODE 0x0000001a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define UND_MODE 0x0000001b
+#define SYSTEM_MODE 0x0000001f
+#define MODE32_BIT 0x00000010
+#define MODE_MASK 0x0000001f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define V4_PSR_T_BIT 0x00000020
+#define V7M_PSR_T_BIT 0x01000000
+#define PSR_T_BIT V4_PSR_T_BIT
+#define PSR_F_BIT 0x00000040
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PSR_I_BIT 0x00000080
+#define PSR_A_BIT 0x00000100
+#define PSR_E_BIT 0x00000200
+#define PSR_J_BIT 0x01000000
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PSR_Q_BIT 0x08000000
+#define PSR_V_BIT 0x10000000
+#define PSR_C_BIT 0x20000000
+#define PSR_Z_BIT 0x40000000
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PSR_N_BIT 0x80000000
+#define PSR_f 0xff000000
+#define PSR_s 0x00ff0000
+#define PSR_x 0x0000ff00
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PSR_c 0x000000ff
+#define APSR_MASK 0xf80f0000
+#define PSR_ISET_MASK 0x01000010
+#define PSR_IT_MASK 0x0600fc00
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PSR_ENDIAN_MASK 0x00000200
+#define PSR_ENDSTATE 0
+#define PT_TEXT_ADDR 0x10000
+#define PT_DATA_ADDR 0x10004
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define PT_TEXT_END_ADDR 0x10008
+#ifndef __ASSEMBLY__
+struct pt_regs {
+ long uregs[18];
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#define ARM_cpsr uregs[16]
+#define ARM_pc uregs[15]
+#define ARM_lr uregs[14]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ARM_sp uregs[13]
+#define ARM_ip uregs[12]
+#define ARM_fp uregs[11]
+#define ARM_r10 uregs[10]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ARM_r9 uregs[9]
+#define ARM_r8 uregs[8]
+#define ARM_r7 uregs[7]
+#define ARM_r6 uregs[6]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ARM_r5 uregs[5]
+#define ARM_r4 uregs[4]
+#define ARM_r3 uregs[3]
+#define ARM_r2 uregs[2]
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ARM_r1 uregs[1]
+#define ARM_r0 uregs[0]
+#define ARM_ORIG_r0 uregs[17]
+#define ARM_VFPREGS_SIZE ( 32 * 8   + 4   )
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/resource.h b/9/platforms/android-21/arch-arm/usr/include/asm/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/resource.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/sembuf.h b/9/platforms/android-21/arch-arm/usr/include/asm/sembuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/sembuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/sembuf.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/setup.h b/9/platforms/android-21/arch-arm/usr/include/asm/setup.h
new file mode 100644
index 0000000..0f2a18b
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/setup.h
@@ -0,0 +1,155 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _UAPI__ASMARM_SETUP_H
+#define _UAPI__ASMARM_SETUP_H
+#include <linux/types.h>
+#define COMMAND_LINE_SIZE 1024
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ATAG_NONE 0x00000000
+struct tag_header {
+ __u32 size;
+ __u32 tag;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#define ATAG_CORE 0x54410001
+struct tag_core {
+ __u32 flags;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u32 pagesize;
+ __u32 rootdev;
+};
+#define ATAG_MEM 0x54410002
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct tag_mem32 {
+ __u32 size;
+ __u32 start;
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ATAG_VIDEOTEXT 0x54410003
+struct tag_videotext {
+ __u8 x;
+ __u8 y;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u16 video_page;
+ __u8 video_mode;
+ __u8 video_cols;
+ __u16 video_ega_bx;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u8 video_lines;
+ __u8 video_isvga;
+ __u16 video_points;
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ATAG_RAMDISK 0x54410004
+struct tag_ramdisk {
+ __u32 flags;
+ __u32 size;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u32 start;
+};
+#define ATAG_INITRD 0x54410005
+#define ATAG_INITRD2 0x54420005
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct tag_initrd {
+ __u32 start;
+ __u32 size;
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define ATAG_SERIAL 0x54410006
+struct tag_serialnr {
+ __u32 low;
+ __u32 high;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#define ATAG_REVISION 0x54410007
+struct tag_revision {
+ __u32 rev;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#define ATAG_VIDEOLFB 0x54410008
+struct tag_videolfb {
+ __u16 lfb_width;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u16 lfb_height;
+ __u16 lfb_depth;
+ __u16 lfb_linelength;
+ __u32 lfb_base;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u32 lfb_size;
+ __u8 red_size;
+ __u8 red_pos;
+ __u8 green_size;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u8 green_pos;
+ __u8 blue_size;
+ __u8 blue_pos;
+ __u8 rsvd_size;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u8 rsvd_pos;
+};
+#define ATAG_CMDLINE 0x54410009
+struct tag_cmdline {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ char cmdline[1];
+};
+#define ATAG_ACORN 0x41000101
+struct tag_acorn {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ __u32 memc_control_reg;
+ __u32 vram_pages;
+ __u8 sounddefault;
+ __u8 adfsdrives;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#define ATAG_MEMCLK 0x41000402
+struct tag_memclk {
+ __u32 fmemclk;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+struct tag {
+ struct tag_header hdr;
+ union {
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ struct tag_core core;
+ struct tag_mem32 mem;
+ struct tag_videotext videotext;
+ struct tag_ramdisk ramdisk;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ struct tag_initrd initrd;
+ struct tag_serialnr serialnr;
+ struct tag_revision revision;
+ struct tag_videolfb videolfb;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ struct tag_cmdline cmdline;
+ struct tag_acorn acorn;
+ struct tag_memclk memclk;
+ } u;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+struct tagtable {
+ __u32 tag;
+ int (*parse)(const struct tag *);
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#define tag_member_present(tag,member)   ((unsigned long)(&((struct tag *)0L)->member + 1)   <= (tag)->hdr.size * 4)
+#define tag_next(t) ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
+#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define for_each_tag(t,base)   for (t = base; t->hdr.size; t = tag_next(t))
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/shmbuf.h b/9/platforms/android-21/arch-arm/usr/include/asm/shmbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/shmbuf.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/shmbuf.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/sigcontext.h b/9/platforms/android-21/arch-arm/usr/include/asm/sigcontext.h
new file mode 100644
index 0000000..bda2339
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/sigcontext.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _ASMARM_SIGCONTEXT_H
+#define _ASMARM_SIGCONTEXT_H
+struct sigcontext {
+ unsigned long trap_no;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long error_code;
+ unsigned long oldmask;
+ unsigned long arm_r0;
+ unsigned long arm_r1;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long arm_r2;
+ unsigned long arm_r3;
+ unsigned long arm_r4;
+ unsigned long arm_r5;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long arm_r6;
+ unsigned long arm_r7;
+ unsigned long arm_r8;
+ unsigned long arm_r9;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long arm_r10;
+ unsigned long arm_fp;
+ unsigned long arm_ip;
+ unsigned long arm_sp;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long arm_lr;
+ unsigned long arm_pc;
+ unsigned long arm_cpsr;
+ unsigned long fault_address;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+};
+#endif
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/siginfo.h b/9/platforms/android-21/arch-arm/usr/include/asm/siginfo.h
new file mode 100644
index 0000000..a31ebb2
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/siginfo.h
@@ -0,0 +1,19 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#include <asm-generic/siginfo.h>
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/signal.h b/9/platforms/android-21/arch-arm/usr/include/asm/signal.h
new file mode 100644
index 0000000..fd39aaa
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/signal.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _UAPI_ASMARM_SIGNAL_H
+#define _UAPI_ASMARM_SIGNAL_H
+#include <linux/types.h>
+struct siginfo;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define _KERNEL_NSIG 32
+typedef unsigned long sigset_t;
+#define SIGHUP 1
+#define SIGINT 2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGQUIT 3
+#define SIGILL 4
+#define SIGTRAP 5
+#define SIGABRT 6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGIOT 6
+#define SIGBUS 7
+#define SIGFPE 8
+#define SIGKILL 9
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGUSR1 10
+#define SIGSEGV 11
+#define SIGUSR2 12
+#define SIGPIPE 13
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGALRM 14
+#define SIGTERM 15
+#define SIGSTKFLT 16
+#define SIGCHLD 17
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGCONT 18
+#define SIGSTOP 19
+#define SIGTSTP 20
+#define SIGTTIN 21
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGTTOU 22
+#define SIGURG 23
+#define SIGXCPU 24
+#define SIGXFSZ 25
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGVTALRM 26
+#define SIGPROF 27
+#define SIGWINCH 28
+#define SIGIO 29
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SIGPOLL SIGIO
+#define SIGPWR 30
+#define SIGSYS 31
+#define SIGUNUSED 31
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __SIGRTMIN 32
+#define __SIGRTMAX _KERNEL__NSIG
+#define SIGSWI 32
+#define SA_NOCLDSTOP 0x00000001
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SA_NOCLDWAIT 0x00000002
+#define SA_SIGINFO 0x00000004
+#define SA_THIRTYTWO 0x02000000
+#define SA_RESTORER 0x04000000
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SA_ONSTACK 0x08000000
+#define SA_RESTART 0x10000000
+#define SA_NODEFER 0x40000000
+#define SA_RESETHAND 0x80000000
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SA_NOMASK SA_NODEFER
+#define SA_ONESHOT SA_RESETHAND
+#define MINSIGSTKSZ 2048
+#define SIGSTKSZ 8192
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#include <asm-generic/signal-defs.h>
+struct sigaction {
+ union {
+ __sighandler_t _sa_handler;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ void (*_sa_sigaction)(int, struct siginfo *, void *);
+ } _u;
+ sigset_t sa_mask;
+ unsigned long sa_flags;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ void (*sa_restorer)(void);
+};
+#define sa_handler _u._sa_handler
+#define sa_sigaction _u._sa_sigaction
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+typedef struct sigaltstack {
+ void __user *ss_sp;
+ int ss_flags;
+ size_t ss_size;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+} stack_t;
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/socket.h b/9/platforms/android-21/arch-arm/usr/include/asm/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/socket.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/sockios.h b/9/platforms/android-21/arch-arm/usr/include/asm/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/sockios.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/sockios.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/stat.h b/9/platforms/android-21/arch-arm/usr/include/asm/stat.h
new file mode 100644
index 0000000..b3425dd
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/stat.h
@@ -0,0 +1,91 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _ASMARM_STAT_H
+#define _ASMARM_STAT_H
+struct __old_kernel_stat {
+ unsigned short st_dev;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned short st_ino;
+ unsigned short st_mode;
+ unsigned short st_nlink;
+ unsigned short st_uid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned short st_gid;
+ unsigned short st_rdev;
+ unsigned long st_size;
+ unsigned long st_atime;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_mtime;
+ unsigned long st_ctime;
+};
+#define STAT_HAVE_NSEC
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct stat {
+ unsigned long st_dev;
+ unsigned long st_ino;
+ unsigned short st_mode;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned short st_nlink;
+ unsigned short st_uid;
+ unsigned short st_gid;
+ unsigned long st_rdev;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_size;
+ unsigned long st_blksize;
+ unsigned long st_blocks;
+ unsigned long st_atime;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_atime_nsec;
+ unsigned long st_mtime;
+ unsigned long st_mtime_nsec;
+ unsigned long st_ctime;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_ctime_nsec;
+ unsigned long __unused4;
+ unsigned long __unused5;
+};
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+struct stat64 {
+ unsigned long long st_dev;
+ unsigned char __pad0[4];
+#define STAT64_HAS_BROKEN_ST_INO 1
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long __st_ino;
+ unsigned int st_mode;
+ unsigned int st_nlink;
+ unsigned long st_uid;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_gid;
+ unsigned long long st_rdev;
+ unsigned char __pad3[4];
+ long long st_size;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_blksize;
+ unsigned long long st_blocks;
+ unsigned long st_atime;
+ unsigned long st_atime_nsec;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long st_mtime;
+ unsigned long st_mtime_nsec;
+ unsigned long st_ctime;
+ unsigned long st_ctime_nsec;
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ unsigned long long st_ino;
+};
+#endif
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/statfs.h b/9/platforms/android-21/arch-arm/usr/include/asm/statfs.h
new file mode 100644
index 0000000..d1f3b81
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/statfs.h
@@ -0,0 +1,24 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _ASMARM_STATFS_H
+#define _ASMARM_STATFS_H
+#define ARCH_PACK_STATFS64 __attribute__((packed,aligned(4)))
+#include <asm-generic/statfs.h>
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/swab.h b/9/platforms/android-21/arch-arm/usr/include/asm/swab.h
new file mode 100644
index 0000000..2703324
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/swab.h
@@ -0,0 +1,31 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _UAPI__ASM_ARM_SWAB_H
+#define _UAPI__ASM_ARM_SWAB_H
+#include <linux/compiler.h>
+#include <linux/types.h>
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#ifndef __STRICT_ANSI__
+#define __SWAB_64_THRU_32__
+#endif
+#ifndef __thumb__
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
+#define __arch_swab32 __arch_swab32
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/termbits.h b/9/platforms/android-21/arch-arm/usr/include/asm/termbits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/termbits.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/termios.h b/9/platforms/android-21/arch-arm/usr/include/asm/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/termios.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/types.h b/9/platforms/android-21/arch-arm/usr/include/asm/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/types.h
copy to 9/platforms/android-21/arch-arm/usr/include/asm/types.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/asm/unistd.h b/9/platforms/android-21/arch-arm/usr/include/asm/unistd.h
new file mode 100644
index 0000000..be9f36f
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/asm/unistd.h
@@ -0,0 +1,484 @@
+/****************************************************************************
+ ****************************************************************************
+ ***
+ ***   This header was automatically generated from a Linux kernel header
+ ***   of the same name, to make information necessary for userspace to
+ ***   call into the kernel available to libc.  It contains only constants,
+ ***   structures, and macros generated from the original header, and thus,
+ ***   contains no copyrightable information.
+ ***
+ ***   To edit the content of this header, modify the corresponding
+ ***   source file (e.g. under external/kernel-headers/original/) then
+ ***   run bionic/libc/kernel/tools/update_all.py
+ ***
+ ***   Any manual change here will be lost the next time this script will
+ ***   be run. You've been warned!
+ ***
+ ****************************************************************************
+ ****************************************************************************/
+#ifndef _UAPI__ASM_ARM_UNISTD_H
+#define _UAPI__ASM_ARM_UNISTD_H
+#define __NR_OABI_SYSCALL_BASE 0x900000
+#define __NR_SYSCALL_BASE 0
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_restart_syscall (__NR_SYSCALL_BASE+ 0)
+#define __NR_exit (__NR_SYSCALL_BASE+ 1)
+#define __NR_fork (__NR_SYSCALL_BASE+ 2)
+#define __NR_read (__NR_SYSCALL_BASE+ 3)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_write (__NR_SYSCALL_BASE+ 4)
+#define __NR_open (__NR_SYSCALL_BASE+ 5)
+#define __NR_close (__NR_SYSCALL_BASE+ 6)
+#define __NR_creat (__NR_SYSCALL_BASE+ 8)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_link (__NR_SYSCALL_BASE+ 9)
+#define __NR_unlink (__NR_SYSCALL_BASE+ 10)
+#define __NR_execve (__NR_SYSCALL_BASE+ 11)
+#define __NR_chdir (__NR_SYSCALL_BASE+ 12)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_time (__NR_SYSCALL_BASE+ 13)
+#define __NR_mknod (__NR_SYSCALL_BASE+ 14)
+#define __NR_chmod (__NR_SYSCALL_BASE+ 15)
+#define __NR_lchown (__NR_SYSCALL_BASE+ 16)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_lseek (__NR_SYSCALL_BASE+ 19)
+#define __NR_getpid (__NR_SYSCALL_BASE+ 20)
+#define __NR_mount (__NR_SYSCALL_BASE+ 21)
+#define __NR_umount (__NR_SYSCALL_BASE+ 22)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_setuid (__NR_SYSCALL_BASE+ 23)
+#define __NR_getuid (__NR_SYSCALL_BASE+ 24)
+#define __NR_stime (__NR_SYSCALL_BASE+ 25)
+#define __NR_ptrace (__NR_SYSCALL_BASE+ 26)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_alarm (__NR_SYSCALL_BASE+ 27)
+#define __NR_pause (__NR_SYSCALL_BASE+ 29)
+#define __NR_utime (__NR_SYSCALL_BASE+ 30)
+#define __NR_access (__NR_SYSCALL_BASE+ 33)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_nice (__NR_SYSCALL_BASE+ 34)
+#define __NR_sync (__NR_SYSCALL_BASE+ 36)
+#define __NR_kill (__NR_SYSCALL_BASE+ 37)
+#define __NR_rename (__NR_SYSCALL_BASE+ 38)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_mkdir (__NR_SYSCALL_BASE+ 39)
+#define __NR_rmdir (__NR_SYSCALL_BASE+ 40)
+#define __NR_dup (__NR_SYSCALL_BASE+ 41)
+#define __NR_pipe (__NR_SYSCALL_BASE+ 42)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_times (__NR_SYSCALL_BASE+ 43)
+#define __NR_brk (__NR_SYSCALL_BASE+ 45)
+#define __NR_setgid (__NR_SYSCALL_BASE+ 46)
+#define __NR_getgid (__NR_SYSCALL_BASE+ 47)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_geteuid (__NR_SYSCALL_BASE+ 49)
+#define __NR_getegid (__NR_SYSCALL_BASE+ 50)
+#define __NR_acct (__NR_SYSCALL_BASE+ 51)
+#define __NR_umount2 (__NR_SYSCALL_BASE+ 52)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_ioctl (__NR_SYSCALL_BASE+ 54)
+#define __NR_fcntl (__NR_SYSCALL_BASE+ 55)
+#define __NR_setpgid (__NR_SYSCALL_BASE+ 57)
+#define __NR_umask (__NR_SYSCALL_BASE+ 60)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_chroot (__NR_SYSCALL_BASE+ 61)
+#define __NR_ustat (__NR_SYSCALL_BASE+ 62)
+#define __NR_dup2 (__NR_SYSCALL_BASE+ 63)
+#define __NR_getppid (__NR_SYSCALL_BASE+ 64)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getpgrp (__NR_SYSCALL_BASE+ 65)
+#define __NR_setsid (__NR_SYSCALL_BASE+ 66)
+#define __NR_sigaction (__NR_SYSCALL_BASE+ 67)
+#define __NR_setreuid (__NR_SYSCALL_BASE+ 70)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_setregid (__NR_SYSCALL_BASE+ 71)
+#define __NR_sigsuspend (__NR_SYSCALL_BASE+ 72)
+#define __NR_sigpending (__NR_SYSCALL_BASE+ 73)
+#define __NR_sethostname (__NR_SYSCALL_BASE+ 74)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_setrlimit (__NR_SYSCALL_BASE+ 75)
+#define __NR_getrlimit (__NR_SYSCALL_BASE+ 76)
+#define __NR_getrusage (__NR_SYSCALL_BASE+ 77)
+#define __NR_gettimeofday (__NR_SYSCALL_BASE+ 78)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_settimeofday (__NR_SYSCALL_BASE+ 79)
+#define __NR_getgroups (__NR_SYSCALL_BASE+ 80)
+#define __NR_setgroups (__NR_SYSCALL_BASE+ 81)
+#define __NR_select (__NR_SYSCALL_BASE+ 82)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_symlink (__NR_SYSCALL_BASE+ 83)
+#define __NR_readlink (__NR_SYSCALL_BASE+ 85)
+#define __NR_uselib (__NR_SYSCALL_BASE+ 86)
+#define __NR_swapon (__NR_SYSCALL_BASE+ 87)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_reboot (__NR_SYSCALL_BASE+ 88)
+#define __NR_readdir (__NR_SYSCALL_BASE+ 89)
+#define __NR_mmap (__NR_SYSCALL_BASE+ 90)
+#define __NR_munmap (__NR_SYSCALL_BASE+ 91)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_truncate (__NR_SYSCALL_BASE+ 92)
+#define __NR_ftruncate (__NR_SYSCALL_BASE+ 93)
+#define __NR_fchmod (__NR_SYSCALL_BASE+ 94)
+#define __NR_fchown (__NR_SYSCALL_BASE+ 95)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getpriority (__NR_SYSCALL_BASE+ 96)
+#define __NR_setpriority (__NR_SYSCALL_BASE+ 97)
+#define __NR_statfs (__NR_SYSCALL_BASE+ 99)
+#define __NR_fstatfs (__NR_SYSCALL_BASE+100)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_socketcall (__NR_SYSCALL_BASE+102)
+#define __NR_syslog (__NR_SYSCALL_BASE+103)
+#define __NR_setitimer (__NR_SYSCALL_BASE+104)
+#define __NR_getitimer (__NR_SYSCALL_BASE+105)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_stat (__NR_SYSCALL_BASE+106)
+#define __NR_lstat (__NR_SYSCALL_BASE+107)
+#define __NR_fstat (__NR_SYSCALL_BASE+108)
+#define __NR_vhangup (__NR_SYSCALL_BASE+111)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_syscall (__NR_SYSCALL_BASE+113)
+#define __NR_wait4 (__NR_SYSCALL_BASE+114)
+#define __NR_swapoff (__NR_SYSCALL_BASE+115)
+#define __NR_sysinfo (__NR_SYSCALL_BASE+116)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_ipc (__NR_SYSCALL_BASE+117)
+#define __NR_fsync (__NR_SYSCALL_BASE+118)
+#define __NR_sigreturn (__NR_SYSCALL_BASE+119)
+#define __NR_clone (__NR_SYSCALL_BASE+120)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_setdomainname (__NR_SYSCALL_BASE+121)
+#define __NR_uname (__NR_SYSCALL_BASE+122)
+#define __NR_adjtimex (__NR_SYSCALL_BASE+124)
+#define __NR_mprotect (__NR_SYSCALL_BASE+125)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_sigprocmask (__NR_SYSCALL_BASE+126)
+#define __NR_init_module (__NR_SYSCALL_BASE+128)
+#define __NR_delete_module (__NR_SYSCALL_BASE+129)
+#define __NR_quotactl (__NR_SYSCALL_BASE+131)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getpgid (__NR_SYSCALL_BASE+132)
+#define __NR_fchdir (__NR_SYSCALL_BASE+133)
+#define __NR_bdflush (__NR_SYSCALL_BASE+134)
+#define __NR_sysfs (__NR_SYSCALL_BASE+135)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_personality (__NR_SYSCALL_BASE+136)
+#define __NR_setfsuid (__NR_SYSCALL_BASE+138)
+#define __NR_setfsgid (__NR_SYSCALL_BASE+139)
+#define __NR__llseek (__NR_SYSCALL_BASE+140)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getdents (__NR_SYSCALL_BASE+141)
+#define __NR__newselect (__NR_SYSCALL_BASE+142)
+#define __NR_flock (__NR_SYSCALL_BASE+143)
+#define __NR_msync (__NR_SYSCALL_BASE+144)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_readv (__NR_SYSCALL_BASE+145)
+#define __NR_writev (__NR_SYSCALL_BASE+146)
+#define __NR_getsid (__NR_SYSCALL_BASE+147)
+#define __NR_fdatasync (__NR_SYSCALL_BASE+148)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR__sysctl (__NR_SYSCALL_BASE+149)
+#define __NR_mlock (__NR_SYSCALL_BASE+150)
+#define __NR_munlock (__NR_SYSCALL_BASE+151)
+#define __NR_mlockall (__NR_SYSCALL_BASE+152)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_munlockall (__NR_SYSCALL_BASE+153)
+#define __NR_sched_setparam (__NR_SYSCALL_BASE+154)
+#define __NR_sched_getparam (__NR_SYSCALL_BASE+155)
+#define __NR_sched_setscheduler (__NR_SYSCALL_BASE+156)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_sched_getscheduler (__NR_SYSCALL_BASE+157)
+#define __NR_sched_yield (__NR_SYSCALL_BASE+158)
+#define __NR_sched_get_priority_max (__NR_SYSCALL_BASE+159)
+#define __NR_sched_get_priority_min (__NR_SYSCALL_BASE+160)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_sched_rr_get_interval (__NR_SYSCALL_BASE+161)
+#define __NR_nanosleep (__NR_SYSCALL_BASE+162)
+#define __NR_mremap (__NR_SYSCALL_BASE+163)
+#define __NR_setresuid (__NR_SYSCALL_BASE+164)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getresuid (__NR_SYSCALL_BASE+165)
+#define __NR_poll (__NR_SYSCALL_BASE+168)
+#define __NR_nfsservctl (__NR_SYSCALL_BASE+169)
+#define __NR_setresgid (__NR_SYSCALL_BASE+170)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getresgid (__NR_SYSCALL_BASE+171)
+#define __NR_prctl (__NR_SYSCALL_BASE+172)
+#define __NR_rt_sigreturn (__NR_SYSCALL_BASE+173)
+#define __NR_rt_sigaction (__NR_SYSCALL_BASE+174)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_rt_sigprocmask (__NR_SYSCALL_BASE+175)
+#define __NR_rt_sigpending (__NR_SYSCALL_BASE+176)
+#define __NR_rt_sigtimedwait (__NR_SYSCALL_BASE+177)
+#define __NR_rt_sigqueueinfo (__NR_SYSCALL_BASE+178)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_rt_sigsuspend (__NR_SYSCALL_BASE+179)
+#define __NR_pread64 (__NR_SYSCALL_BASE+180)
+#define __NR_pwrite64 (__NR_SYSCALL_BASE+181)
+#define __NR_chown (__NR_SYSCALL_BASE+182)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getcwd (__NR_SYSCALL_BASE+183)
+#define __NR_capget (__NR_SYSCALL_BASE+184)
+#define __NR_capset (__NR_SYSCALL_BASE+185)
+#define __NR_sigaltstack (__NR_SYSCALL_BASE+186)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_sendfile (__NR_SYSCALL_BASE+187)
+#define __NR_vfork (__NR_SYSCALL_BASE+190)
+#define __NR_ugetrlimit (__NR_SYSCALL_BASE+191)
+#define __NR_mmap2 (__NR_SYSCALL_BASE+192)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_truncate64 (__NR_SYSCALL_BASE+193)
+#define __NR_ftruncate64 (__NR_SYSCALL_BASE+194)
+#define __NR_stat64 (__NR_SYSCALL_BASE+195)
+#define __NR_lstat64 (__NR_SYSCALL_BASE+196)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fstat64 (__NR_SYSCALL_BASE+197)
+#define __NR_lchown32 (__NR_SYSCALL_BASE+198)
+#define __NR_getuid32 (__NR_SYSCALL_BASE+199)
+#define __NR_getgid32 (__NR_SYSCALL_BASE+200)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_geteuid32 (__NR_SYSCALL_BASE+201)
+#define __NR_getegid32 (__NR_SYSCALL_BASE+202)
+#define __NR_setreuid32 (__NR_SYSCALL_BASE+203)
+#define __NR_setregid32 (__NR_SYSCALL_BASE+204)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getgroups32 (__NR_SYSCALL_BASE+205)
+#define __NR_setgroups32 (__NR_SYSCALL_BASE+206)
+#define __NR_fchown32 (__NR_SYSCALL_BASE+207)
+#define __NR_setresuid32 (__NR_SYSCALL_BASE+208)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getresuid32 (__NR_SYSCALL_BASE+209)
+#define __NR_setresgid32 (__NR_SYSCALL_BASE+210)
+#define __NR_getresgid32 (__NR_SYSCALL_BASE+211)
+#define __NR_chown32 (__NR_SYSCALL_BASE+212)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_setuid32 (__NR_SYSCALL_BASE+213)
+#define __NR_setgid32 (__NR_SYSCALL_BASE+214)
+#define __NR_setfsuid32 (__NR_SYSCALL_BASE+215)
+#define __NR_setfsgid32 (__NR_SYSCALL_BASE+216)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_getdents64 (__NR_SYSCALL_BASE+217)
+#define __NR_pivot_root (__NR_SYSCALL_BASE+218)
+#define __NR_mincore (__NR_SYSCALL_BASE+219)
+#define __NR_madvise (__NR_SYSCALL_BASE+220)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fcntl64 (__NR_SYSCALL_BASE+221)
+#define __NR_gettid (__NR_SYSCALL_BASE+224)
+#define __NR_readahead (__NR_SYSCALL_BASE+225)
+#define __NR_setxattr (__NR_SYSCALL_BASE+226)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_lsetxattr (__NR_SYSCALL_BASE+227)
+#define __NR_fsetxattr (__NR_SYSCALL_BASE+228)
+#define __NR_getxattr (__NR_SYSCALL_BASE+229)
+#define __NR_lgetxattr (__NR_SYSCALL_BASE+230)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fgetxattr (__NR_SYSCALL_BASE+231)
+#define __NR_listxattr (__NR_SYSCALL_BASE+232)
+#define __NR_llistxattr (__NR_SYSCALL_BASE+233)
+#define __NR_flistxattr (__NR_SYSCALL_BASE+234)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_removexattr (__NR_SYSCALL_BASE+235)
+#define __NR_lremovexattr (__NR_SYSCALL_BASE+236)
+#define __NR_fremovexattr (__NR_SYSCALL_BASE+237)
+#define __NR_tkill (__NR_SYSCALL_BASE+238)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_sendfile64 (__NR_SYSCALL_BASE+239)
+#define __NR_futex (__NR_SYSCALL_BASE+240)
+#define __NR_sched_setaffinity (__NR_SYSCALL_BASE+241)
+#define __NR_sched_getaffinity (__NR_SYSCALL_BASE+242)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_io_setup (__NR_SYSCALL_BASE+243)
+#define __NR_io_destroy (__NR_SYSCALL_BASE+244)
+#define __NR_io_getevents (__NR_SYSCALL_BASE+245)
+#define __NR_io_submit (__NR_SYSCALL_BASE+246)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_io_cancel (__NR_SYSCALL_BASE+247)
+#define __NR_exit_group (__NR_SYSCALL_BASE+248)
+#define __NR_lookup_dcookie (__NR_SYSCALL_BASE+249)
+#define __NR_epoll_create (__NR_SYSCALL_BASE+250)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_epoll_ctl (__NR_SYSCALL_BASE+251)
+#define __NR_epoll_wait (__NR_SYSCALL_BASE+252)
+#define __NR_remap_file_pages (__NR_SYSCALL_BASE+253)
+#define __NR_set_tid_address (__NR_SYSCALL_BASE+256)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_timer_create (__NR_SYSCALL_BASE+257)
+#define __NR_timer_settime (__NR_SYSCALL_BASE+258)
+#define __NR_timer_gettime (__NR_SYSCALL_BASE+259)
+#define __NR_timer_getoverrun (__NR_SYSCALL_BASE+260)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_timer_delete (__NR_SYSCALL_BASE+261)
+#define __NR_clock_settime (__NR_SYSCALL_BASE+262)
+#define __NR_clock_gettime (__NR_SYSCALL_BASE+263)
+#define __NR_clock_getres (__NR_SYSCALL_BASE+264)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_clock_nanosleep (__NR_SYSCALL_BASE+265)
+#define __NR_statfs64 (__NR_SYSCALL_BASE+266)
+#define __NR_fstatfs64 (__NR_SYSCALL_BASE+267)
+#define __NR_tgkill (__NR_SYSCALL_BASE+268)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_utimes (__NR_SYSCALL_BASE+269)
+#define __NR_arm_fadvise64_64 (__NR_SYSCALL_BASE+270)
+#define __NR_pciconfig_iobase (__NR_SYSCALL_BASE+271)
+#define __NR_pciconfig_read (__NR_SYSCALL_BASE+272)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_pciconfig_write (__NR_SYSCALL_BASE+273)
+#define __NR_mq_open (__NR_SYSCALL_BASE+274)
+#define __NR_mq_unlink (__NR_SYSCALL_BASE+275)
+#define __NR_mq_timedsend (__NR_SYSCALL_BASE+276)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_mq_timedreceive (__NR_SYSCALL_BASE+277)
+#define __NR_mq_notify (__NR_SYSCALL_BASE+278)
+#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
+#define __NR_waitid (__NR_SYSCALL_BASE+280)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_socket (__NR_SYSCALL_BASE+281)
+#define __NR_bind (__NR_SYSCALL_BASE+282)
+#define __NR_connect (__NR_SYSCALL_BASE+283)
+#define __NR_listen (__NR_SYSCALL_BASE+284)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_accept (__NR_SYSCALL_BASE+285)
+#define __NR_getsockname (__NR_SYSCALL_BASE+286)
+#define __NR_getpeername (__NR_SYSCALL_BASE+287)
+#define __NR_socketpair (__NR_SYSCALL_BASE+288)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_send (__NR_SYSCALL_BASE+289)
+#define __NR_sendto (__NR_SYSCALL_BASE+290)
+#define __NR_recv (__NR_SYSCALL_BASE+291)
+#define __NR_recvfrom (__NR_SYSCALL_BASE+292)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_shutdown (__NR_SYSCALL_BASE+293)
+#define __NR_setsockopt (__NR_SYSCALL_BASE+294)
+#define __NR_getsockopt (__NR_SYSCALL_BASE+295)
+#define __NR_sendmsg (__NR_SYSCALL_BASE+296)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_recvmsg (__NR_SYSCALL_BASE+297)
+#define __NR_semop (__NR_SYSCALL_BASE+298)
+#define __NR_semget (__NR_SYSCALL_BASE+299)
+#define __NR_semctl (__NR_SYSCALL_BASE+300)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_msgsnd (__NR_SYSCALL_BASE+301)
+#define __NR_msgrcv (__NR_SYSCALL_BASE+302)
+#define __NR_msgget (__NR_SYSCALL_BASE+303)
+#define __NR_msgctl (__NR_SYSCALL_BASE+304)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_shmat (__NR_SYSCALL_BASE+305)
+#define __NR_shmdt (__NR_SYSCALL_BASE+306)
+#define __NR_shmget (__NR_SYSCALL_BASE+307)
+#define __NR_shmctl (__NR_SYSCALL_BASE+308)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_add_key (__NR_SYSCALL_BASE+309)
+#define __NR_request_key (__NR_SYSCALL_BASE+310)
+#define __NR_keyctl (__NR_SYSCALL_BASE+311)
+#define __NR_semtimedop (__NR_SYSCALL_BASE+312)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_vserver (__NR_SYSCALL_BASE+313)
+#define __NR_ioprio_set (__NR_SYSCALL_BASE+314)
+#define __NR_ioprio_get (__NR_SYSCALL_BASE+315)
+#define __NR_inotify_init (__NR_SYSCALL_BASE+316)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317)
+#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318)
+#define __NR_mbind (__NR_SYSCALL_BASE+319)
+#define __NR_get_mempolicy (__NR_SYSCALL_BASE+320)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_set_mempolicy (__NR_SYSCALL_BASE+321)
+#define __NR_openat (__NR_SYSCALL_BASE+322)
+#define __NR_mkdirat (__NR_SYSCALL_BASE+323)
+#define __NR_mknodat (__NR_SYSCALL_BASE+324)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fchownat (__NR_SYSCALL_BASE+325)
+#define __NR_futimesat (__NR_SYSCALL_BASE+326)
+#define __NR_fstatat64 (__NR_SYSCALL_BASE+327)
+#define __NR_unlinkat (__NR_SYSCALL_BASE+328)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_renameat (__NR_SYSCALL_BASE+329)
+#define __NR_linkat (__NR_SYSCALL_BASE+330)
+#define __NR_symlinkat (__NR_SYSCALL_BASE+331)
+#define __NR_readlinkat (__NR_SYSCALL_BASE+332)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fchmodat (__NR_SYSCALL_BASE+333)
+#define __NR_faccessat (__NR_SYSCALL_BASE+334)
+#define __NR_pselect6 (__NR_SYSCALL_BASE+335)
+#define __NR_ppoll (__NR_SYSCALL_BASE+336)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_unshare (__NR_SYSCALL_BASE+337)
+#define __NR_set_robust_list (__NR_SYSCALL_BASE+338)
+#define __NR_get_robust_list (__NR_SYSCALL_BASE+339)
+#define __NR_splice (__NR_SYSCALL_BASE+340)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_arm_sync_file_range (__NR_SYSCALL_BASE+341)
+#define __NR_sync_file_range2 __NR_arm_sync_file_range
+#define __NR_tee (__NR_SYSCALL_BASE+342)
+#define __NR_vmsplice (__NR_SYSCALL_BASE+343)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_move_pages (__NR_SYSCALL_BASE+344)
+#define __NR_getcpu (__NR_SYSCALL_BASE+345)
+#define __NR_epoll_pwait (__NR_SYSCALL_BASE+346)
+#define __NR_kexec_load (__NR_SYSCALL_BASE+347)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_utimensat (__NR_SYSCALL_BASE+348)
+#define __NR_signalfd (__NR_SYSCALL_BASE+349)
+#define __NR_timerfd_create (__NR_SYSCALL_BASE+350)
+#define __NR_eventfd (__NR_SYSCALL_BASE+351)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fallocate (__NR_SYSCALL_BASE+352)
+#define __NR_timerfd_settime (__NR_SYSCALL_BASE+353)
+#define __NR_timerfd_gettime (__NR_SYSCALL_BASE+354)
+#define __NR_signalfd4 (__NR_SYSCALL_BASE+355)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_eventfd2 (__NR_SYSCALL_BASE+356)
+#define __NR_epoll_create1 (__NR_SYSCALL_BASE+357)
+#define __NR_dup3 (__NR_SYSCALL_BASE+358)
+#define __NR_pipe2 (__NR_SYSCALL_BASE+359)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_inotify_init1 (__NR_SYSCALL_BASE+360)
+#define __NR_preadv (__NR_SYSCALL_BASE+361)
+#define __NR_pwritev (__NR_SYSCALL_BASE+362)
+#define __NR_rt_tgsigqueueinfo (__NR_SYSCALL_BASE+363)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_perf_event_open (__NR_SYSCALL_BASE+364)
+#define __NR_recvmmsg (__NR_SYSCALL_BASE+365)
+#define __NR_accept4 (__NR_SYSCALL_BASE+366)
+#define __NR_fanotify_init (__NR_SYSCALL_BASE+367)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_fanotify_mark (__NR_SYSCALL_BASE+368)
+#define __NR_prlimit64 (__NR_SYSCALL_BASE+369)
+#define __NR_name_to_handle_at (__NR_SYSCALL_BASE+370)
+#define __NR_open_by_handle_at (__NR_SYSCALL_BASE+371)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_clock_adjtime (__NR_SYSCALL_BASE+372)
+#define __NR_syncfs (__NR_SYSCALL_BASE+373)
+#define __NR_sendmmsg (__NR_SYSCALL_BASE+374)
+#define __NR_setns (__NR_SYSCALL_BASE+375)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_process_vm_readv (__NR_SYSCALL_BASE+376)
+#define __NR_process_vm_writev (__NR_SYSCALL_BASE+377)
+#define __NR_kcmp (__NR_SYSCALL_BASE+378)
+#define __NR_finit_module (__NR_SYSCALL_BASE+379)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __NR_sched_setattr (__NR_SYSCALL_BASE+380)
+#define __NR_sched_getattr (__NR_SYSCALL_BASE+381)
+#define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000)
+#define __ARM_NR_breakpoint (__ARM_NR_BASE+1)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define __ARM_NR_cacheflush (__ARM_NR_BASE+2)
+#define __ARM_NR_usr26 (__ARM_NR_BASE+3)
+#define __ARM_NR_usr32 (__ARM_NR_BASE+4)
+#define __ARM_NR_set_tls (__ARM_NR_BASE+5)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#undef __NR_time
+#undef __NR_umount
+#undef __NR_stime
+#undef __NR_alarm
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#undef __NR_utime
+#undef __NR_getrlimit
+#undef __NR_select
+#undef __NR_readdir
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#undef __NR_mmap
+#undef __NR_socketcall
+#undef __NR_syscall
+#undef __NR_ipc
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#endif
diff --git a/9/platforms/android-19/arch-arm64/usr/include/assert.h b/9/platforms/android-21/arch-arm/usr/include/assert.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/assert.h
copy to 9/platforms/android-21/arch-arm/usr/include/assert.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/byteswap.h b/9/platforms/android-21/arch-arm/usr/include/byteswap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/byteswap.h
copy to 9/platforms/android-21/arch-arm/usr/include/byteswap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/complex.h b/9/platforms/android-21/arch-arm/usr/include/complex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/complex.h
copy to 9/platforms/android-21/arch-arm/usr/include/complex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ctype.h b/9/platforms/android-21/arch-arm/usr/include/ctype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ctype.h
copy to 9/platforms/android-21/arch-arm/usr/include/ctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dirent.h b/9/platforms/android-21/arch-arm/usr/include/dirent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/dirent.h
copy to 9/platforms/android-21/arch-arm/usr/include/dirent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dlfcn.h b/9/platforms/android-21/arch-arm/usr/include/dlfcn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/dlfcn.h
copy to 9/platforms/android-21/arch-arm/usr/include/dlfcn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/elf.h b/9/platforms/android-21/arch-arm/usr/include/elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/elf.h
copy to 9/platforms/android-21/arch-arm/usr/include/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/endian.h b/9/platforms/android-21/arch-arm/usr/include/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/endian.h
copy to 9/platforms/android-21/arch-arm/usr/include/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/err.h b/9/platforms/android-21/arch-arm/usr/include/err.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/err.h
copy to 9/platforms/android-21/arch-arm/usr/include/err.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/errno.h b/9/platforms/android-21/arch-arm/usr/include/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/errno.h
copy to 9/platforms/android-21/arch-arm/usr/include/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fcntl.h b/9/platforms/android-21/arch-arm/usr/include/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fcntl.h
copy to 9/platforms/android-21/arch-arm/usr/include/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/features.h b/9/platforms/android-21/arch-arm/usr/include/features.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/features.h
copy to 9/platforms/android-21/arch-arm/usr/include/features.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fenv.h b/9/platforms/android-21/arch-arm/usr/include/fenv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fenv.h
copy to 9/platforms/android-21/arch-arm/usr/include/fenv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fnmatch.h b/9/platforms/android-21/arch-arm/usr/include/fnmatch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fnmatch.h
copy to 9/platforms/android-21/arch-arm/usr/include/fnmatch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fts.h b/9/platforms/android-21/arch-arm/usr/include/fts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fts.h
copy to 9/platforms/android-21/arch-arm/usr/include/fts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ftw.h b/9/platforms/android-21/arch-arm/usr/include/ftw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ftw.h
copy to 9/platforms/android-21/arch-arm/usr/include/ftw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/getopt.h b/9/platforms/android-21/arch-arm/usr/include/getopt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/getopt.h
copy to 9/platforms/android-21/arch-arm/usr/include/getopt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/grp.h b/9/platforms/android-21/arch-arm/usr/include/grp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/grp.h
copy to 9/platforms/android-21/arch-arm/usr/include/grp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/inttypes.h b/9/platforms/android-21/arch-arm/usr/include/inttypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/inttypes.h
copy to 9/platforms/android-21/arch-arm/usr/include/inttypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/jni.h b/9/platforms/android-21/arch-arm/usr/include/jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/jni.h
copy to 9/platforms/android-21/arch-arm/usr/include/jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/lastlog.h b/9/platforms/android-21/arch-arm/usr/include/lastlog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/lastlog.h
copy to 9/platforms/android-21/arch-arm/usr/include/lastlog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/libgen.h b/9/platforms/android-21/arch-arm/usr/include/libgen.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/libgen.h
copy to 9/platforms/android-21/arch-arm/usr/include/libgen.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/limits.h b/9/platforms/android-21/arch-arm/usr/include/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/limits.h
copy to 9/platforms/android-21/arch-arm/usr/include/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/link.h b/9/platforms/android-21/arch-arm/usr/include/link.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/link.h
copy to 9/platforms/android-21/arch-arm/usr/include/link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h b/9/platforms/android-21/arch-arm/usr/include/linux/a.out.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/a.out.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/acct.h b/9/platforms/android-21/arch-arm/usr/include/linux/acct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/acct.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adb.h b/9/platforms/android-21/arch-arm/usr/include/linux/adb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/adb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/adb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/adfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/adfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h b/9/platforms/android-21/arch-arm/usr/include/linux/affs_hardblocks.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/affs_hardblocks.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h b/9/platforms/android-21/arch-arm/usr/include/linux/agpgart.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/agpgart.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h b/9/platforms/android-21/arch-arm/usr/include/linux/aio_abi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/aio_abi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h b/9/platforms/android-21/arch-arm/usr/include/linux/android_alarm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/android_alarm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h b/9/platforms/android-21/arch-arm/usr/include/linux/apm_bios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/apm_bios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h b/9/platforms/android-21/arch-arm/usr/include/linux/arcfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/arcfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h b/9/platforms/android-21/arch-arm/usr/include/linux/ashmem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ashmem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h b/9/platforms/android-21/arch-arm/usr/include/linux/atalk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm_eni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm_eni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm_he.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm_he.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm_idt77105.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm_idt77105.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm_nicstar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm_nicstar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm_tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h b/9/platforms/android-21/arch-arm/usr/include/linux/atm_zatm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atm_zatm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmapi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmarp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmarp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmbr2684.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmbr2684.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmclip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmclip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmioc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmioc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmlec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmlec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmmpc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmmpc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmsap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmsap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h b/9/platforms/android-21/arch-arm/usr/include/linux/atmsvc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/atmsvc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/audit.h b/9/platforms/android-21/arch-arm/usr/include/linux/audit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/audit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/audit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/auto_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/auto_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h b/9/platforms/android-21/arch-arm/usr/include/linux/auto_fs4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/auto_fs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h b/9/platforms/android-21/arch-arm/usr/include/linux/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h b/9/platforms/android-21/arch-arm/usr/include/linux/ax25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ax25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h b/9/platforms/android-21/arch-arm/usr/include/linux/b1lli.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/b1lli.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h b/9/platforms/android-21/arch-arm/usr/include/linux/baycom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/baycom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h b/9/platforms/android-21/arch-arm/usr/include/linux/bcache.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/bcache.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h b/9/platforms/android-21/arch-arm/usr/include/linux/bcm933xx_hcs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/bcm933xx_hcs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/bfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/bfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binder.h b/9/platforms/android-21/arch-arm/usr/include/linux/binder.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/binder.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/binder.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h b/9/platforms/android-21/arch-arm/usr/include/linux/binfmts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/binfmts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h b/9/platforms/android-21/arch-arm/usr/include/linux/blkpg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/blkpg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h b/9/platforms/android-21/arch-arm/usr/include/linux/blktrace_api.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/blktrace_api.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h b/9/platforms/android-21/arch-arm/usr/include/linux/bpqether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/bpqether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h b/9/platforms/android-21/arch-arm/usr/include/linux/bsg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/bsg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h b/9/platforms/android-21/arch-arm/usr/include/linux/btrfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/btrfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h b/9/platforms/android-21/arch-arm/usr/include/linux/byteorder/big_endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/byteorder/big_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h b/9/platforms/android-21/arch-arm/usr/include/linux/byteorder/little_endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/byteorder/little_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h b/9/platforms/android-21/arch-arm/usr/include/linux/caif/caif_socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/caif/caif_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h b/9/platforms/android-21/arch-arm/usr/include/linux/caif/if_caif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/caif/if_caif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can.h b/9/platforms/android-21/arch-arm/usr/include/linux/can.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/can.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h b/9/platforms/android-21/arch-arm/usr/include/linux/can/bcm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/can/bcm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h b/9/platforms/android-21/arch-arm/usr/include/linux/can/error.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/can/error.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h b/9/platforms/android-21/arch-arm/usr/include/linux/can/gw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/can/gw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/can/netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/can/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h b/9/platforms/android-21/arch-arm/usr/include/linux/can/raw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/can/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capability.h b/9/platforms/android-21/arch-arm/usr/include/linux/capability.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/capability.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capi.h b/9/platforms/android-21/arch-arm/usr/include/linux/capi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/capi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/capi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h b/9/platforms/android-21/arch-arm/usr/include/linux/cciss_defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cciss_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/cciss_ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cciss_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h b/9/platforms/android-21/arch-arm/usr/include/linux/cdrom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cdrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h b/9/platforms/android-21/arch-arm/usr/include/linux/cgroupstats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cgroupstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/chio.h b/9/platforms/android-21/arch-arm/usr/include/linux/chio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/chio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/chio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h b/9/platforms/android-21/arch-arm/usr/include/linux/cifs/cifs_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cifs/cifs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h b/9/platforms/android-21/arch-arm/usr/include/linux/cm4000_cs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cm4000_cs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h b/9/platforms/android-21/arch-arm/usr/include/linux/cn_proc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cn_proc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda.h b/9/platforms/android-21/arch-arm/usr/include/linux/coda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coda.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/coda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h b/9/platforms/android-21/arch-arm/usr/include/linux/coda_psdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/coda_psdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coff.h b/9/platforms/android-21/arch-arm/usr/include/linux/coff.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coff.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/coff.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h b/9/platforms/android-21/arch-arm/usr/include/linux/compiler.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/compiler.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/connector.h b/9/platforms/android-21/arch-arm/usr/include/linux/connector.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/connector.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/connector.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/const.h b/9/platforms/android-21/arch-arm/usr/include/linux/const.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/const.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/const.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/cramfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cramfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h b/9/platforms/android-21/arch-arm/usr/include/linux/cuda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cuda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h b/9/platforms/android-21/arch-arm/usr/include/linux/cyclades.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cyclades.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h b/9/platforms/android-21/arch-arm/usr/include/linux/cycx_cfm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/cycx_cfm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h b/9/platforms/android-21/arch-arm/usr/include/linux/dcbnl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dcbnl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h b/9/platforms/android-21/arch-arm/usr/include/linux/dccp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h b/9/platforms/android-21/arch-arm/usr/include/linux/dlm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dlm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h b/9/platforms/android-21/arch-arm/usr/include/linux/dlm_device.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dlm_device.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/dlm_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dlm_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h b/9/platforms/android-21/arch-arm/usr/include/linux/dlm_plock.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dlm_plock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h b/9/platforms/android-21/arch-arm/usr/include/linux/dlmconstants.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dlmconstants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/dm-ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dm-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h b/9/platforms/android-21/arch-arm/usr/include/linux/dm-log-userspace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dm-log-userspace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dn.h b/9/platforms/android-21/arch-arm/usr/include/linux/dn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dn.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h b/9/platforms/android-21/arch-arm/usr/include/linux/dqblk_xfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dqblk_xfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/audio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/ca.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/ca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/dmx.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/dmx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/frontend.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/frontend.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/osd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/osd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/version.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h b/9/platforms/android-21/arch-arm/usr/include/linux/dvb/video.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/dvb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/edd.h b/9/platforms/android-21/arch-arm/usr/include/linux/edd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/edd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/edd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h b/9/platforms/android-21/arch-arm/usr/include/linux/efs_fs_sb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/efs_fs_sb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h b/9/platforms/android-21/arch-arm/usr/include/linux/elf-em.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/elf-em.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h b/9/platforms/android-21/arch-arm/usr/include/linux/elf-fdpic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/elf-fdpic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf.h b/9/platforms/android-21/arch-arm/usr/include/linux/elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h b/9/platforms/android-21/arch-arm/usr/include/linux/elfcore.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/elfcore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errno.h b/9/platforms/android-21/arch-arm/usr/include/linux/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/errno.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h b/9/platforms/android-21/arch-arm/usr/include/linux/errqueue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/errqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h b/9/platforms/android-21/arch-arm/usr/include/linux/ethtool.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ethtool.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h b/9/platforms/android-21/arch-arm/usr/include/linux/eventpoll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/eventpoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h b/9/platforms/android-21/arch-arm/usr/include/linux/fadvise.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fadvise.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h b/9/platforms/android-21/arch-arm/usr/include/linux/falloc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/falloc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h b/9/platforms/android-21/arch-arm/usr/include/linux/fanotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fanotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fb.h b/9/platforms/android-21/arch-arm/usr/include/linux/fb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h b/9/platforms/android-21/arch-arm/usr/include/linux/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fd.h b/9/platforms/android-21/arch-arm/usr/include/linux/fd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h b/9/platforms/android-21/arch-arm/usr/include/linux/fdreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h b/9/platforms/android-21/arch-arm/usr/include/linux/fib_rules.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fib_rules.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h b/9/platforms/android-21/arch-arm/usr/include/linux/fiemap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fiemap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/filter.h b/9/platforms/android-21/arch-arm/usr/include/linux/filter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/filter.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/filter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h b/9/platforms/android-21/arch-arm/usr/include/linux/firewire-cdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/firewire-cdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h b/9/platforms/android-21/arch-arm/usr/include/linux/firewire-constants.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/firewire-constants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/flat.h b/9/platforms/android-21/arch-arm/usr/include/linux/flat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/flat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/flat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h b/9/platforms/android-21/arch-arm/usr/include/linux/fsl_hypervisor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fsl_hypervisor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h b/9/platforms/android-21/arch-arm/usr/include/linux/fuse.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/fuse.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/futex.h b/9/platforms/android-21/arch-arm/usr/include/linux/futex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/futex.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/futex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h b/9/platforms/android-21/arch-arm/usr/include/linux/gameport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/gameport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h b/9/platforms/android-21/arch-arm/usr/include/linux/gen_stats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/gen_stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/genetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/genetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h b/9/platforms/android-21/arch-arm/usr/include/linux/genwqe/genwqe_card.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/genwqe/genwqe_card.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h b/9/platforms/android-21/arch-arm/usr/include/linux/gfs2_ondisk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/gfs2_ondisk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h b/9/platforms/android-21/arch-arm/usr/include/linux/gigaset_dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/gigaset_dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h b/9/platforms/android-21/arch-arm/usr/include/linux/hash_info.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hash_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h b/9/platforms/android-21/arch-arm/usr/include/linux/hdlc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hdlc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/hdlc/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hdlc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h b/9/platforms/android-21/arch-arm/usr/include/linux/hdlcdrv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hdlcdrv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h b/9/platforms/android-21/arch-arm/usr/include/linux/hdreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hid.h b/9/platforms/android-21/arch-arm/usr/include/linux/hid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hid.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h b/9/platforms/android-21/arch-arm/usr/include/linux/hiddev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hiddev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h b/9/platforms/android-21/arch-arm/usr/include/linux/hidraw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hidraw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h b/9/platforms/android-21/arch-arm/usr/include/linux/hpet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hpet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h b/9/platforms/android-21/arch-arm/usr/include/linux/hsi/hsi_char.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hsi/hsi_char.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/hsr_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hsr_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h b/9/platforms/android-21/arch-arm/usr/include/linux/hw_breakpoint.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h b/9/platforms/android-21/arch-arm/usr/include/linux/hysdn_if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/hysdn_if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h b/9/platforms/android-21/arch-arm/usr/include/linux/i2c-dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/i2c-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h b/9/platforms/android-21/arch-arm/usr/include/linux/i2c.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/i2c.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h b/9/platforms/android-21/arch-arm/usr/include/linux/i2o-dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/i2o-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h b/9/platforms/android-21/arch-arm/usr/include/linux/i8k.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/i8k.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h b/9/platforms/android-21/arch-arm/usr/include/linux/icmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h b/9/platforms/android-21/arch-arm/usr/include/linux/icmpv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/icmpv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if.h b/9/platforms/android-21/arch-arm/usr/include/linux/if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_addr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_addr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_addrlabel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_addrlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_alg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_alg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_arcnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_arcnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_bonding.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_bonding.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_bridge.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_cablemodem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_cablemodem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_eql.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_eql.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_fc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_fc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_fddi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_fddi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_frad.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_frad.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_hippi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_hippi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_infiniband.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_infiniband.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_link.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_ltalk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_ltalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_phonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_plip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_plip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_ppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_pppol2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_pppol2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_pppolac.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_pppolac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_pppopns.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_pppopns.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_pppox.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_pppox.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_slip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_slip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_team.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_team.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_tun.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_tun.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_tunnel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_vlan.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h b/9/platforms/android-21/arch-arm/usr/include/linux/if_x25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/if_x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h b/9/platforms/android-21/arch-arm/usr/include/linux/igmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/igmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in.h b/9/platforms/android-21/arch-arm/usr/include/linux/in.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in6.h b/9/platforms/android-21/arch-arm/usr/include/linux/in6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in6.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h b/9/platforms/android-21/arch-arm/usr/include/linux/in_route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/in_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h b/9/platforms/android-21/arch-arm/usr/include/linux/inet_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/inet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h b/9/platforms/android-21/arch-arm/usr/include/linux/inotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h b/9/platforms/android-21/arch-arm/usr/include/linux/input.h
similarity index 97%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/input.h
rename to 9/platforms/android-21/arch-arm/usr/include/linux/input.h
index df3200c..b9d5b2a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h
+++ b/9/platforms/android-21/arch-arm/usr/include/linux/input.h
@@ -97,629 +97,644 @@
 #define INPUT_PROP_BUTTONPAD 0x02
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define INPUT_PROP_SEMI_MT 0x03
+#define INPUT_PROP_TOPBUTTONPAD 0x04
 #define INPUT_PROP_MAX 0x1f
 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_SYN 0x00
 #define EV_KEY 0x01
 #define EV_REL 0x02
 #define EV_ABS 0x03
-#define EV_MSC 0x04
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MSC 0x04
 #define EV_SW 0x05
 #define EV_LED 0x11
 #define EV_SND 0x12
-#define EV_REP 0x14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_REP 0x14
 #define EV_FF 0x15
 #define EV_PWR 0x16
 #define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MAX 0x1f
 #define EV_CNT (EV_MAX+1)
 #define SYN_REPORT 0
 #define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SYN_MT_REPORT 2
 #define SYN_DROPPED 3
 #define SYN_MAX 0xf
 #define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RESERVED 0
 #define KEY_ESC 1
 #define KEY_1 2
 #define KEY_2 3
-#define KEY_3 4
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_3 4
 #define KEY_4 5
 #define KEY_5 6
 #define KEY_6 7
-#define KEY_7 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_7 8
 #define KEY_8 9
 #define KEY_9 10
 #define KEY_0 11
-#define KEY_MINUS 12
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MINUS 12
 #define KEY_EQUAL 13
 #define KEY_BACKSPACE 14
 #define KEY_TAB 15
-#define KEY_Q 16
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Q 16
 #define KEY_W 17
 #define KEY_E 18
 #define KEY_R 19
-#define KEY_T 20
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_T 20
 #define KEY_Y 21
 #define KEY_U 22
 #define KEY_I 23
-#define KEY_O 24
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_O 24
 #define KEY_P 25
 #define KEY_LEFTBRACE 26
 #define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ENTER 28
 #define KEY_LEFTCTRL 29
 #define KEY_A 30
 #define KEY_S 31
-#define KEY_D 32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_D 32
 #define KEY_F 33
 #define KEY_G 34
 #define KEY_H 35
-#define KEY_J 36
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_J 36
 #define KEY_K 37
 #define KEY_L 38
 #define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_APOSTROPHE 40
 #define KEY_GRAVE 41
 #define KEY_LEFTSHIFT 42
 #define KEY_BACKSLASH 43
-#define KEY_Z 44
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Z 44
 #define KEY_X 45
 #define KEY_C 46
 #define KEY_V 47
-#define KEY_B 48
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_B 48
 #define KEY_N 49
 #define KEY_M 50
 #define KEY_COMMA 51
-#define KEY_DOT 52
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DOT 52
 #define KEY_SLASH 53
 #define KEY_RIGHTSHIFT 54
 #define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFTALT 56
 #define KEY_SPACE 57
 #define KEY_CAPSLOCK 58
 #define KEY_F1 59
-#define KEY_F2 60
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F2 60
 #define KEY_F3 61
 #define KEY_F4 62
 #define KEY_F5 63
-#define KEY_F6 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F6 64
 #define KEY_F7 65
 #define KEY_F8 66
 #define KEY_F9 67
-#define KEY_F10 68
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F10 68
 #define KEY_NUMLOCK 69
 #define KEY_SCROLLLOCK 70
 #define KEY_KP7 71
-#define KEY_KP8 72
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP8 72
 #define KEY_KP9 73
 #define KEY_KPMINUS 74
 #define KEY_KP4 75
-#define KEY_KP5 76
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP5 76
 #define KEY_KP6 77
 #define KEY_KPPLUS 78
 #define KEY_KP1 79
-#define KEY_KP2 80
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP2 80
 #define KEY_KP3 81
 #define KEY_KP0 82
 #define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ZENKAKUHANKAKU 85
 #define KEY_102ND 86
 #define KEY_F11 87
 #define KEY_F12 88
-#define KEY_RO 89
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RO 89
 #define KEY_KATAKANA 90
 #define KEY_HIRAGANA 91
 #define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KATAKANAHIRAGANA 93
 #define KEY_MUHENKAN 94
 #define KEY_KPJPCOMMA 95
 #define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RIGHTCTRL 97
 #define KEY_KPSLASH 98
 #define KEY_SYSRQ 99
 #define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LINEFEED 101
 #define KEY_HOME 102
 #define KEY_UP 103
 #define KEY_PAGEUP 104
-#define KEY_LEFT 105
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFT 105
 #define KEY_RIGHT 106
 #define KEY_END 107
 #define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PAGEDOWN 109
 #define KEY_INSERT 110
 #define KEY_DELETE 111
 #define KEY_MACRO 112
-#define KEY_MUTE 113
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MUTE 113
 #define KEY_VOLUMEDOWN 114
 #define KEY_VOLUMEUP 115
 #define KEY_POWER 116
-#define KEY_KPEQUAL 117
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPEQUAL 117
 #define KEY_KPPLUSMINUS 118
 #define KEY_PAUSE 119
 #define KEY_SCALE 120
-#define KEY_KPCOMMA 121
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPCOMMA 121
 #define KEY_HANGEUL 122
 #define KEY_HANGUEL KEY_HANGEUL
 #define KEY_HANJA 123
-#define KEY_YEN 124
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_YEN 124
 #define KEY_LEFTMETA 125
 #define KEY_RIGHTMETA 126
 #define KEY_COMPOSE 127
-#define KEY_STOP 128
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_STOP 128
 #define KEY_AGAIN 129
 #define KEY_PROPS 130
 #define KEY_UNDO 131
-#define KEY_FRONT 132
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FRONT 132
 #define KEY_COPY 133
 #define KEY_OPEN 134
 #define KEY_PASTE 135
-#define KEY_FIND 136
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FIND 136
 #define KEY_CUT 137
 #define KEY_HELP 138
 #define KEY_MENU 139
-#define KEY_CALC 140
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CALC 140
 #define KEY_SETUP 141
 #define KEY_SLEEP 142
 #define KEY_WAKEUP 143
-#define KEY_FILE 144
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FILE 144
 #define KEY_SENDFILE 145
 #define KEY_DELETEFILE 146
 #define KEY_XFER 147
-#define KEY_PROG1 148
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PROG1 148
 #define KEY_PROG2 149
 #define KEY_WWW 150
 #define KEY_MSDOS 151
-#define KEY_COFFEE 152
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_COFFEE 152
 #define KEY_SCREENLOCK KEY_COFFEE
 #define KEY_DIRECTION 153
 #define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MAIL 155
 #define KEY_BOOKMARKS 156
 #define KEY_COMPUTER 157
 #define KEY_BACK 158
-#define KEY_FORWARD 159
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FORWARD 159
 #define KEY_CLOSECD 160
 #define KEY_EJECTCD 161
 #define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_NEXTSONG 163
 #define KEY_PLAYPAUSE 164
 #define KEY_PREVIOUSSONG 165
 #define KEY_STOPCD 166
-#define KEY_RECORD 167
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RECORD 167
 #define KEY_REWIND 168
 #define KEY_PHONE 169
 #define KEY_ISO 170
-#define KEY_CONFIG 171
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CONFIG 171
 #define KEY_HOMEPAGE 172
 #define KEY_REFRESH 173
 #define KEY_EXIT 174
-#define KEY_MOVE 175
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MOVE 175
 #define KEY_EDIT 176
 #define KEY_SCROLLUP 177
 #define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPLEFTPAREN 179
 #define KEY_KPRIGHTPAREN 180
 #define KEY_NEW 181
 #define KEY_REDO 182
-#define KEY_F13 183
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F13 183
 #define KEY_F14 184
 #define KEY_F15 185
 #define KEY_F16 186
-#define KEY_F17 187
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F17 187
 #define KEY_F18 188
 #define KEY_F19 189
 #define KEY_F20 190
-#define KEY_F21 191
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F21 191
 #define KEY_F22 192
 #define KEY_F23 193
 #define KEY_F24 194
-#define KEY_PLAYCD 200
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PLAYCD 200
 #define KEY_PAUSECD 201
 #define KEY_PROG3 202
 #define KEY_PROG4 203
-#define KEY_DASHBOARD 204
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DASHBOARD 204
 #define KEY_SUSPEND 205
 #define KEY_CLOSE 206
 #define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FASTFORWARD 208
 #define KEY_BASSBOOST 209
 #define KEY_PRINT 210
 #define KEY_HP 211
-#define KEY_CAMERA 212
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CAMERA 212
 #define KEY_SOUND 213
 #define KEY_QUESTION 214
 #define KEY_EMAIL 215
-#define KEY_CHAT 216
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CHAT 216
 #define KEY_SEARCH 217
 #define KEY_CONNECT 218
 #define KEY_FINANCE 219
-#define KEY_SPORT 220
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SPORT 220
 #define KEY_SHOP 221
 #define KEY_ALTERASE 222
 #define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESSDOWN 224
 #define KEY_BRIGHTNESSUP 225
 #define KEY_MEDIA 226
 #define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KBDILLUMTOGGLE 228
 #define KEY_KBDILLUMDOWN 229
 #define KEY_KBDILLUMUP 230
 #define KEY_SEND 231
-#define KEY_REPLY 232
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_REPLY 232
 #define KEY_FORWARDMAIL 233
 #define KEY_SAVE 234
 #define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BATTERY 236
 #define KEY_BLUETOOTH 237
 #define KEY_WLAN 238
 #define KEY_UWB 239
-#define KEY_UNKNOWN 240
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_UNKNOWN 240
 #define KEY_VIDEO_NEXT 241
 #define KEY_VIDEO_PREV 242
 #define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_AUTO 244
+#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF 245
 #define KEY_WWAN 246
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WIMAX KEY_WWAN
 #define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MICMUTE 248
 #define BTN_MISC 0x100
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_0 0x100
 #define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_2 0x102
 #define BTN_3 0x103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_4 0x104
 #define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_6 0x106
 #define BTN_7 0x107
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_8 0x108
 #define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MOUSE 0x110
 #define BTN_LEFT 0x110
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_RIGHT 0x111
 #define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SIDE 0x113
 #define BTN_EXTRA 0x114
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_FORWARD 0x115
 #define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TASK 0x117
 #define BTN_JOYSTICK 0x120
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER 0x120
 #define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMB2 0x122
 #define BTN_TOP 0x123
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOP2 0x124
 #define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE 0x126
 #define BTN_BASE2 0x127
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE3 0x128
 #define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE5 0x12a
 #define BTN_BASE6 0x12b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DEAD 0x12f
 #define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SOUTH 0x130
 #define BTN_A BTN_SOUTH
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_EAST 0x131
 #define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_C 0x132
 #define BTN_NORTH 0x133
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_X BTN_NORTH
 #define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_Y BTN_WEST
 #define BTN_Z 0x135
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL 0x136
 #define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL2 0x138
 #define BTN_TR2 0x139
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SELECT 0x13a
 #define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MODE 0x13c
 #define BTN_THUMBL 0x13d
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMBR 0x13e
 #define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_PEN 0x140
 #define BTN_TOOL_RUBBER 0x141
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_BRUSH 0x142
 #define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_AIRBRUSH 0x144
 #define BTN_TOOL_FINGER 0x145
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_MOUSE 0x146
 #define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUINTTAP 0x148
 #define BTN_TOUCH 0x14a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_STYLUS 0x14b
 #define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_DOUBLETAP 0x14d
 #define BTN_TOOL_TRIPLETAP 0x14e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUADTAP 0x14f
 #define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_GEAR_DOWN 0x150
 #define BTN_GEAR_UP 0x151
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_OK 0x160
 #define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GOTO 0x162
 #define KEY_CLEAR 0x163
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_POWER2 0x164
 #define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_INFO 0x166
 #define KEY_TIME 0x167
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VENDOR 0x168
 #define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PROGRAM 0x16a
 #define KEY_CHANNEL 0x16b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FAVORITES 0x16c
 #define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PVR 0x16e
 #define KEY_MHP 0x16f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_LANGUAGE 0x170
 #define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SUBTITLE 0x172
 #define KEY_ANGLE 0x173
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOM 0x174
 #define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_KEYBOARD 0x176
 #define KEY_SCREEN 0x177
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PC 0x178
 #define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TV2 0x17a
 #define KEY_VCR 0x17b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VCR2 0x17c
 #define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SAT2 0x17e
 #define KEY_CD 0x17f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TAPE 0x180
 #define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TUNER 0x182
 #define KEY_PLAYER 0x183
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEXT 0x184
 #define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUX 0x186
 #define KEY_MP3 0x187
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUDIO 0x188
 #define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DIRECTORY 0x18a
 #define KEY_LIST 0x18b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEMO 0x18c
 #define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RED 0x18e
 #define KEY_GREEN 0x18f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_YELLOW 0x190
 #define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CHANNELUP 0x192
 #define KEY_CHANNELDOWN 0x193
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FIRST 0x194
 #define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AB 0x196
 #define KEY_NEXT 0x197
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RESTART 0x198
 #define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SHUFFLE 0x19a
 #define KEY_BREAK 0x19b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PREVIOUS 0x19c
 #define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEEN 0x19e
 #define KEY_TWEN 0x19f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VIDEOPHONE 0x1a0
 #define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMIN 0x1a2
 #define KEY_ZOOMOUT 0x1a3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMRESET 0x1a4
 #define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EDITOR 0x1a6
 #define KEY_SPREADSHEET 0x1a7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GRAPHICSEDITOR 0x1a8
 #define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DATABASE 0x1aa
 #define KEY_NEWS 0x1ab
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VOICEMAIL 0x1ac
 #define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MESSENGER 0x1ae
 #define KEY_DISPLAYTOGGLE 0x1af
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK 0x1b0
 #define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DOLLAR 0x1b2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EURO 0x1b3
 #define KEY_FRAMEBACK 0x1b4
 #define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CONTEXT_MENU 0x1b6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEDIA_REPEAT 0x1b7
 #define KEY_10CHANNELSUP 0x1b8
 #define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_IMAGES 0x1ba
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_EOL 0x1c0
 #define KEY_DEL_EOS 0x1c1
 #define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_LINE 0x1c3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN 0x1d0
 #define KEY_FN_ESC 0x1d1
 #define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F2 0x1d3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F3 0x1d4
 #define KEY_FN_F4 0x1d5
 #define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F6 0x1d7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F7 0x1d8
 #define KEY_FN_F8 0x1d9
 #define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F10 0x1db
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F11 0x1dc
 #define KEY_FN_F12 0x1dd
 #define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_2 0x1df
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_D 0x1e0
 #define KEY_FN_E 0x1e1
 #define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_S 0x1e3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_B 0x1e4
 #define KEY_BRL_DOT1 0x1f1
 #define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT3 0x1f3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT4 0x1f4
 #define KEY_BRL_DOT5 0x1f5
 #define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT7 0x1f7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT8 0x1f8
 #define KEY_BRL_DOT9 0x1f9
 #define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_0 0x200
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_1 0x201
 #define KEY_NUMERIC_2 0x202
 #define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_4 0x204
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_5 0x205
 #define KEY_NUMERIC_6 0x206
 #define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_8 0x208
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_9 0x209
 #define KEY_NUMERIC_STAR 0x20a
 #define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_FOCUS 0x210
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WPS_BUTTON 0x211
 #define KEY_TOUCHPAD_TOGGLE 0x212
 #define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TOUCHPAD_OFF 0x214
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_ZOOMIN 0x215
 #define KEY_CAMERA_ZOOMOUT 0x216
 #define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_DOWN 0x218
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_LEFT 0x219
 #define KEY_CAMERA_RIGHT 0x21a
 #define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_OFF 0x21c
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_TOGGLE 0x21d
 #define KEY_LIGHTS_TOGGLE 0x21e
 #define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_DOWN 0x221
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_LEFT 0x222
 #define BTN_DPAD_RIGHT 0x223
 #define KEY_ALS_TOGGLE 0x230
+#define KEY_BUTTONCONFIG 0x240
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_TASKMANAGER 0x241
+#define KEY_JOURNAL 0x242
+#define KEY_CONTROLPANEL 0x243
+#define KEY_APPSELECT 0x244
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SCREENSAVER 0x245
+#define KEY_VOICECOMMAND 0x246
+#define KEY_BRIGHTNESS_MIN 0x250
+#define KEY_BRIGHTNESS_MAX 0x251
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER_HAPPY 0x2c0
 #define BTN_TRIGGER_HAPPY1 0x2c0
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ion.h b/9/platforms/android-21/arch-arm/usr/include/linux/ion.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ion.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ion.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h b/9/platforms/android-21/arch-arm/usr/include/linux/ioprio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ioprio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip.h b/9/platforms/android-21/arch-arm/usr/include/linux/ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h b/9/platforms/android-21/arch-arm/usr/include/linux/ip6_tunnel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ip6_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h b/9/platforms/android-21/arch-arm/usr/include/linux/ip_vs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ip_vs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipmi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipmi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipmi_msgdefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipmi_msgdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipsec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipsec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipv6_route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipv6_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h b/9/platforms/android-21/arch-arm/usr/include/linux/ipx.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ipx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irda.h b/9/platforms/android-21/arch-arm/usr/include/linux/irda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/irda.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/irda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h b/9/platforms/android-21/arch-arm/usr/include/linux/irqnr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/irqnr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h b/9/platforms/android-21/arch-arm/usr/include/linux/isdn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/isdn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h b/9/platforms/android-21/arch-arm/usr/include/linux/isdn/capicmd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/isdn/capicmd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h b/9/platforms/android-21/arch-arm/usr/include/linux/isdn_divertif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/isdn_divertif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h b/9/platforms/android-21/arch-arm/usr/include/linux/isdn_ppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/isdn_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h b/9/platforms/android-21/arch-arm/usr/include/linux/isdnif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/isdnif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/iso_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/iso_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h b/9/platforms/android-21/arch-arm/usr/include/linux/ivtv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ivtv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h b/9/platforms/android-21/arch-arm/usr/include/linux/ivtvfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ivtvfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h b/9/platforms/android-21/arch-arm/usr/include/linux/ixjuser.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ixjuser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h b/9/platforms/android-21/arch-arm/usr/include/linux/jffs2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/jffs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h b/9/platforms/android-21/arch-arm/usr/include/linux/joystick.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/joystick.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kd.h b/9/platforms/android-21/arch-arm/usr/include/linux/kd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h b/9/platforms/android-21/arch-arm/usr/include/linux/kdev_t.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kdev_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h b/9/platforms/android-21/arch-arm/usr/include/linux/kernel-page-flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kernel-page-flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h b/9/platforms/android-21/arch-arm/usr/include/linux/kernel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kernel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h b/9/platforms/android-21/arch-arm/usr/include/linux/kernelcapi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kernelcapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h b/9/platforms/android-21/arch-arm/usr/include/linux/kexec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kexec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h b/9/platforms/android-21/arch-arm/usr/include/linux/keyboard.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/keyboard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h b/9/platforms/android-21/arch-arm/usr/include/linux/keychord.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/keychord.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/keyctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/keyctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h b/9/platforms/android-21/arch-arm/usr/include/linux/kvm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kvm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h b/9/platforms/android-21/arch-arm/usr/include/linux/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h b/9/platforms/android-21/arch-arm/usr/include/linux/l2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h b/9/platforms/android-21/arch-arm/usr/include/linux/libc-compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/libc-compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/limits.h b/9/platforms/android-21/arch-arm/usr/include/linux/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/limits.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/llc.h b/9/platforms/android-21/arch-arm/usr/include/linux/llc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/llc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/llc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/loop.h b/9/platforms/android-21/arch-arm/usr/include/linux/loop.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/loop.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/loop.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/lp.h b/9/platforms/android-21/arch-arm/usr/include/linux/lp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/lp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/lp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/magic.h b/9/platforms/android-21/arch-arm/usr/include/linux/magic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/magic.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/magic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/major.h b/9/platforms/android-21/arch-arm/usr/include/linux/major.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/major.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/major.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h b/9/platforms/android-21/arch-arm/usr/include/linux/map_to_7segment.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/map_to_7segment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h b/9/platforms/android-21/arch-arm/usr/include/linux/matroxfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/matroxfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h b/9/platforms/android-21/arch-arm/usr/include/linux/mdio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/media.h b/9/platforms/android-21/arch-arm/usr/include/linux/media.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/media.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/media.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mei.h b/9/platforms/android-21/arch-arm/usr/include/linux/mei.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mei.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mei.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h b/9/platforms/android-21/arch-arm/usr/include/linux/mempolicy.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mempolicy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/meye.h b/9/platforms/android-21/arch-arm/usr/include/linux/meye.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/meye.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/meye.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h b/9/platforms/android-21/arch-arm/usr/include/linux/mic_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mic_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/mic_ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mic_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mii.h b/9/platforms/android-21/arch-arm/usr/include/linux/mii.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mii.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mii.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/minix_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/minix_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mman.h b/9/platforms/android-21/arch-arm/usr/include/linux/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mman.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/mmc/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mmc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h b/9/platforms/android-21/arch-arm/usr/include/linux/mmtimer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mmtimer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/module.h b/9/platforms/android-21/arch-arm/usr/include/linux/module.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/module.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/module.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h b/9/platforms/android-21/arch-arm/usr/include/linux/mqueue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h b/9/platforms/android-21/arch-arm/usr/include/linux/mroute.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mroute.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h b/9/platforms/android-21/arch-arm/usr/include/linux/mroute6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mroute6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/msdos_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/msdos_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msg.h b/9/platforms/android-21/arch-arm/usr/include/linux/msg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/msg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h b/9/platforms/android-21/arch-arm/usr/include/linux/mtio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/mtio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h b/9/platforms/android-21/arch-arm/usr/include/linux/n_r3964.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/n_r3964.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h b/9/platforms/android-21/arch-arm/usr/include/linux/nbd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nbd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h b/9/platforms/android-21/arch-arm/usr/include/linux/ncp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ncp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/ncp_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ncp_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h b/9/platforms/android-21/arch-arm/usr/include/linux/ncp_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ncp_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h b/9/platforms/android-21/arch-arm/usr/include/linux/ncp_no.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ncp_no.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h b/9/platforms/android-21/arch-arm/usr/include/linux/neighbour.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/neighbour.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net.h b/9/platforms/android-21/arch-arm/usr/include/linux/net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h b/9/platforms/android-21/arch-arm/usr/include/linux/net_dropmon.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/net_dropmon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h b/9/platforms/android-21/arch-arm/usr/include/linux/net_tstamp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/net_tstamp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h b/9/platforms/android-21/arch-arm/usr/include/linux/netconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h b/9/platforms/android-21/arch-arm/usr/include/linux/netdevice.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netdevice.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nf_tables_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/nfnetlink_queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/x_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/x_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_AUDIT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CONNMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_CT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_DSCP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_DSCP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_HMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_HMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_LED.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_LED.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_MARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_MARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_NFLOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_RATEEST.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_SECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TCPMSS.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TEE.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TEE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_TPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_addrtype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_addrtype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_bpf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_bpf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_cgroup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_cgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_cluster.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_cluster.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_comment.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_comment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connbytes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connbytes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connlabel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connlimit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connmark.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_connmark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_conntrack.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_cpu.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_cpu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_dccp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_devgroup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_devgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_dscp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_dscp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_ecn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_esp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_esp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_hashlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_helper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_helper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_ipcomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_iprange.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_iprange.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_ipvs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_ipvs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_l2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_length.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_length.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_limit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_mac.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_mac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_mark.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_mark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_multiport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_multiport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_nfacct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_nfacct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_osf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_osf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_owner.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_owner.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_physdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_physdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_pkttype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_policy.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_policy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_quota.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_rateest.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_rateest.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_realm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_realm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_recent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_recent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_rpfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_set.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_state.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_state.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_statistic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_statistic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_tcpmss.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_tcpudp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_u32.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter/xt_u32.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_arp/arp_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_among.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_bridge/ebtables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_decnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_decnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h b/9/platforms/android-21/arch-arm/usr/include/linux/netlink_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netlink_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h b/9/platforms/android-21/arch-arm/usr/include/linux/netrom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/netrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs4_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs4_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs_idmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs_idmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfs_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfsacl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfsacl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfsd/cld.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfsd/cld.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfsd/debug.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfsd/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfsd/export.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfsd/export.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfsd/nfsfh.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfsd/nfsfh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h b/9/platforms/android-21/arch-arm/usr/include/linux/nfsd/stats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nfsd/stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h b/9/platforms/android-21/arch-arm/usr/include/linux/nl80211.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nl80211.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h b/9/platforms/android-21/arch-arm/usr/include/linux/nubus.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nubus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h b/9/platforms/android-21/arch-arm/usr/include/linux/nvme.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nvme.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h b/9/platforms/android-21/arch-arm/usr/include/linux/nvram.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/nvram.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h b/9/platforms/android-21/arch-arm/usr/include/linux/omap3isp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/omap3isp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h b/9/platforms/android-21/arch-arm/usr/include/linux/omapfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/omapfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/oom.h b/9/platforms/android-21/arch-arm/usr/include/linux/oom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/oom.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/oom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h b/9/platforms/android-21/arch-arm/usr/include/linux/openvswitch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/openvswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h b/9/platforms/android-21/arch-arm/usr/include/linux/packet_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/packet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/param.h b/9/platforms/android-21/arch-arm/usr/include/linux/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/param.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/parport.h b/9/platforms/android-21/arch-arm/usr/include/linux/parport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/parport.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/parport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h b/9/platforms/android-21/arch-arm/usr/include/linux/patchkey.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/patchkey.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci.h b/9/platforms/android-21/arch-arm/usr/include/linux/pci.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pci.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h b/9/platforms/android-21/arch-arm/usr/include/linux/pci_regs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pci_regs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h b/9/platforms/android-21/arch-arm/usr/include/linux/perf_event.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/perf_event.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/personality.h b/9/platforms/android-21/arch-arm/usr/include/linux/personality.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/personality.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h b/9/platforms/android-21/arch-arm/usr/include/linux/pfkeyv2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pfkeyv2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pg.h b/9/platforms/android-21/arch-arm/usr/include/linux/pg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h b/9/platforms/android-21/arch-arm/usr/include/linux/phantom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/phantom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h b/9/platforms/android-21/arch-arm/usr/include/linux/phonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h b/9/platforms/android-21/arch-arm/usr/include/linux/pkt_cls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pkt_cls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h b/9/platforms/android-21/arch-arm/usr/include/linux/pkt_sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pkt_sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h b/9/platforms/android-21/arch-arm/usr/include/linux/pktcdvd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pktcdvd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h b/9/platforms/android-21/arch-arm/usr/include/linux/pmu.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pmu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/poll.h b/9/platforms/android-21/arch-arm/usr/include/linux/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/poll.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h b/9/platforms/android-21/arch-arm/usr/include/linux/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h b/9/platforms/android-21/arch-arm/usr/include/linux/ppdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ppdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h b/9/platforms/android-21/arch-arm/usr/include/linux/ppp-comp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ppp-comp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/ppp-ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ppp-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h b/9/platforms/android-21/arch-arm/usr/include/linux/ppp_defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ppp_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pps.h b/9/platforms/android-21/arch-arm/usr/include/linux/pps.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pps.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/pps.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h b/9/platforms/android-21/arch-arm/usr/include/linux/ptp_clock.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ptp_clock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h b/9/platforms/android-21/arch-arm/usr/include/linux/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/qnx4_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/qnx4_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h b/9/platforms/android-21/arch-arm/usr/include/linux/qnxtypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/qnxtypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/quota.h b/9/platforms/android-21/arch-arm/usr/include/linux/quota.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/quota.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h b/9/platforms/android-21/arch-arm/usr/include/linux/radeonfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/radeonfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h b/9/platforms/android-21/arch-arm/usr/include/linux/raid/md_p.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/raid/md_p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h b/9/platforms/android-21/arch-arm/usr/include/linux/raid/md_u.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/raid/md_u.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/random.h b/9/platforms/android-21/arch-arm/usr/include/linux/random.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/random.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/random.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raw.h b/9/platforms/android-21/arch-arm/usr/include/linux/raw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raw.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rds.h b/9/platforms/android-21/arch-arm/usr/include/linux/rds.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rds.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/rds.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h b/9/platforms/android-21/arch-arm/usr/include/linux/reboot.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/reiserfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/reiserfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h b/9/platforms/android-21/arch-arm/usr/include/linux/reiserfs_xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/reiserfs_xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/resource.h b/9/platforms/android-21/arch-arm/usr/include/linux/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/resource.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h b/9/platforms/android-21/arch-arm/usr/include/linux/rfkill.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/rfkill.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/romfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/romfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rose.h b/9/platforms/android-21/arch-arm/usr/include/linux/rose.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rose.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/rose.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/route.h b/9/platforms/android-21/arch-arm/usr/include/linux/route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/route.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h b/9/platforms/android-21/arch-arm/usr/include/linux/rtc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/rtc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/rtnetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/rtnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/scc.h b/9/platforms/android-21/arch-arm/usr/include/linux/scc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/scc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/scc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sched.h b/9/platforms/android-21/arch-arm/usr/include/linux/sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sched.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h b/9/platforms/android-21/arch-arm/usr/include/linux/screen_info.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/screen_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h b/9/platforms/android-21/arch-arm/usr/include/linux/sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h b/9/platforms/android-21/arch-arm/usr/include/linux/sdla.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sdla.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h b/9/platforms/android-21/arch-arm/usr/include/linux/seccomp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/seccomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h b/9/platforms/android-21/arch-arm/usr/include/linux/securebits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/securebits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h b/9/platforms/android-21/arch-arm/usr/include/linux/selinux_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/selinux_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sem.h b/9/platforms/android-21/arch-arm/usr/include/linux/sem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sem.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial.h b/9/platforms/android-21/arch-arm/usr/include/linux/serial.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/serial.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h b/9/platforms/android-21/arch-arm/usr/include/linux/serial_core.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/serial_core.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h b/9/platforms/android-21/arch-arm/usr/include/linux/serial_reg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/serial_reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serio.h b/9/platforms/android-21/arch-arm/usr/include/linux/serio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/serio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/shm.h b/9/platforms/android-21/arch-arm/usr/include/linux/shm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/shm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signal.h b/9/platforms/android-21/arch-arm/usr/include/linux/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/signal.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h b/9/platforms/android-21/arch-arm/usr/include/linux/signalfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h b/9/platforms/android-21/arch-arm/usr/include/linux/snmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/snmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h b/9/platforms/android-21/arch-arm/usr/include/linux/sock_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sock_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/socket.h b/9/platforms/android-21/arch-arm/usr/include/linux/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/socket.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h b/9/platforms/android-21/arch-arm/usr/include/linux/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/som.h b/9/platforms/android-21/arch-arm/usr/include/linux/som.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/som.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/som.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h b/9/platforms/android-21/arch-arm/usr/include/linux/sonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h b/9/platforms/android-21/arch-arm/usr/include/linux/sonypi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sonypi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sound.h b/9/platforms/android-21/arch-arm/usr/include/linux/sound.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sound.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h b/9/platforms/android-21/arch-arm/usr/include/linux/soundcard.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/soundcard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h b/9/platforms/android-21/arch-arm/usr/include/linux/spi/spidev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/spi/spidev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stat.h b/9/platforms/android-21/arch-arm/usr/include/linux/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/stat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h b/9/platforms/android-21/arch-arm/usr/include/linux/stddef.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/stddef.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/string.h b/9/platforms/android-21/arch-arm/usr/include/linux/string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/string.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h b/9/platforms/android-21/arch-arm/usr/include/linux/sunrpc/debug.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sunrpc/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h b/9/platforms/android-21/arch-arm/usr/include/linux/suspend_ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/suspend_ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h b/9/platforms/android-21/arch-arm/usr/include/linux/sw_sync.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sw_sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/swab.h b/9/platforms/android-21/arch-arm/usr/include/linux/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/swab.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sync.h b/9/platforms/android-21/arch-arm/usr/include/linux/sync.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sync.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h b/9/platforms/android-21/arch-arm/usr/include/linux/synclink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/synclink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h b/9/platforms/android-21/arch-arm/usr/include/linux/sysctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sysctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h b/9/platforms/android-21/arch-arm/usr/include/linux/sysinfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h b/9/platforms/android-21/arch-arm/usr/include/linux/taskstats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/taskstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_csum.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_csum.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_defact.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_defact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_gact.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_gact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_ipt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_ipt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_mirred.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_mirred.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_pedit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_pedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_skbedit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_act/tc_skbedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_meta.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h b/9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tc_ematch/tc_em_text.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h b/9/platforms/android-21/arch-arm/usr/include/linux/tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h b/9/platforms/android-21/arch-arm/usr/include/linux/tcp_metrics.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tcp_metrics.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h b/9/platforms/android-21/arch-arm/usr/include/linux/telephony.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/telephony.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/termios.h b/9/platforms/android-21/arch-arm/usr/include/linux/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/termios.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/time.h b/9/platforms/android-21/arch-arm/usr/include/linux/time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/time.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/times.h b/9/platforms/android-21/arch-arm/usr/include/linux/times.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/times.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/timex.h b/9/platforms/android-21/arch-arm/usr/include/linux/timex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/timex.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h b/9/platforms/android-21/arch-arm/usr/include/linux/tiocl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tiocl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h b/9/platforms/android-21/arch-arm/usr/include/linux/tipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h b/9/platforms/android-21/arch-arm/usr/include/linux/tipc_config.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tipc_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h b/9/platforms/android-21/arch-arm/usr/include/linux/toshiba.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/toshiba.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty.h b/9/platforms/android-21/arch-arm/usr/include/linux/tty.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tty.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h b/9/platforms/android-21/arch-arm/usr/include/linux/tty_flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/tty_flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/types.h b/9/platforms/android-21/arch-arm/usr/include/linux/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/types.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h b/9/platforms/android-21/arch-arm/usr/include/linux/udf_fs_i.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/udf_fs_i.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udp.h b/9/platforms/android-21/arch-arm/usr/include/linux/udp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/udp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h b/9/platforms/android-21/arch-arm/usr/include/linux/uhid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/uhid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h b/9/platforms/android-21/arch-arm/usr/include/linux/uinput.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/uinput.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uio.h b/9/platforms/android-21/arch-arm/usr/include/linux/uio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h b/9/platforms/android-21/arch-arm/usr/include/linux/ultrasound.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/ultrasound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/un.h b/9/platforms/android-21/arch-arm/usr/include/linux/un.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/un.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h b/9/platforms/android-21/arch-arm/usr/include/linux/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h b/9/platforms/android-21/arch-arm/usr/include/linux/unix_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/unix_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/audio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/cdc-wdm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/cdc-wdm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/cdc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/cdc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/ch11.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/ch11.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/ch9.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/ch9.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/f_accessory.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/f_accessory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/f_mtp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/f_mtp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/functionfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/functionfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/g_printer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/g_printer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/gadgetfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/gadgetfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/midi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/midi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/tmc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/tmc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h b/9/platforms/android-21/arch-arm/usr/include/linux/usb/video.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h b/9/platforms/android-21/arch-arm/usr/include/linux/usbdevice_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/usbdevice_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utime.h b/9/platforms/android-21/arch-arm/usr/include/linux/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/utime.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h b/9/platforms/android-21/arch-arm/usr/include/linux/utsname.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h b/9/platforms/android-21/arch-arm/usr/include/linux/uuid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/uuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h b/9/platforms/android-21/arch-arm/usr/include/linux/uvcvideo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/uvcvideo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h b/9/platforms/android-21/arch-arm/usr/include/linux/v4l2-common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/v4l2-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h b/9/platforms/android-21/arch-arm/usr/include/linux/v4l2-controls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/v4l2-controls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h b/9/platforms/android-21/arch-arm/usr/include/linux/v4l2-dv-timings.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/v4l2-dv-timings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h b/9/platforms/android-21/arch-arm/usr/include/linux/v4l2-mediabus.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/v4l2-mediabus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h b/9/platforms/android-21/arch-arm/usr/include/linux/v4l2-subdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/v4l2-subdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/version.h b/9/platforms/android-21/arch-arm/usr/include/linux/version.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/version.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/veth.h b/9/platforms/android-21/arch-arm/usr/include/linux/veth.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/veth.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/veth.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h b/9/platforms/android-21/arch-arm/usr/include/linux/vfio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/vfio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h b/9/platforms/android-21/arch-arm/usr/include/linux/vhost.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/vhost.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h b/9/platforms/android-21/arch-arm/usr/include/linux/videodev2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/videodev2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_9p.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_9p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_balloon.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_balloon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_blk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_blk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_config.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_console.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_console.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_ids.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_pci.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_ring.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_ring.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h b/9/platforms/android-21/arch-arm/usr/include/linux/virtio_rng.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/virtio_rng.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h b/9/platforms/android-21/arch-arm/usr/include/linux/vm_sockets.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/vm_sockets.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h b/9/platforms/android-21/arch-arm/usr/include/linux/vsp1.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/vsp1.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vt.h b/9/platforms/android-21/arch-arm/usr/include/linux/vt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vt.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wait.h b/9/platforms/android-21/arch-arm/usr/include/linux/wait.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wait.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h b/9/platforms/android-21/arch-arm/usr/include/linux/wanrouter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/wanrouter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h b/9/platforms/android-21/arch-arm/usr/include/linux/watchdog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/watchdog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h b/9/platforms/android-21/arch-arm/usr/include/linux/wimax.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/wimax.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h b/9/platforms/android-21/arch-arm/usr/include/linux/wimax/i2400m.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/wimax/i2400m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h b/9/platforms/android-21/arch-arm/usr/include/linux/wireless.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/wireless.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/x25.h b/9/platforms/android-21/arch-arm/usr/include/linux/x25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/x25.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h b/9/platforms/android-21/arch-arm/usr/include/linux/xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h b/9/platforms/android-21/arch-arm/usr/include/linux/xfrm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/xfrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h b/9/platforms/android-21/arch-arm/usr/include/linux/zorro.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/zorro.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h b/9/platforms/android-21/arch-arm/usr/include/linux/zorro_ids.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h
copy to 9/platforms/android-21/arch-arm/usr/include/linux/zorro_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/locale.h b/9/platforms/android-21/arch-arm/usr/include/locale.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/locale.h
copy to 9/platforms/android-21/arch-arm/usr/include/locale.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/asm.h b/9/platforms/android-21/arch-arm/usr/include/machine/asm.h
new file mode 100644
index 0000000..7954f05
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/asm.h
@@ -0,0 +1,59 @@
+/*	$OpenBSD: asm.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $	*/
+
+/*
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
+ */
+
+#ifndef _ARM32_ASM_H_
+#define _ARM32_ASM_H_
+
+#ifndef _ALIGN_TEXT
+# define _ALIGN_TEXT .align 0
+#endif
+
+#undef __bionic_asm_custom_entry
+#undef __bionic_asm_custom_end
+#define __bionic_asm_custom_entry(f) .fnstart
+#define __bionic_asm_custom_end(f) .fnend
+
+#undef __bionic_asm_function_type
+#define __bionic_asm_function_type #function
+
+#if defined(__ELF__) && defined(PIC)
+#define PIC_SYM(x,y) x ## ( ## y ## )
+#else
+#define PIC_SYM(x,y) x
+#endif
+
+#endif /* !_ARM_ASM_H_ */
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/cpu-features.h b/9/platforms/android-21/arch-arm/usr/include/machine/cpu-features.h
new file mode 100644
index 0000000..fc5a8fd
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/cpu-features.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef _ARM_MACHINE_CPU_FEATURES_H
+#define _ARM_MACHINE_CPU_FEATURES_H
+
+/* The purpose of this file is to define several macros corresponding
+ * to CPU features that may or may not be available at build time on
+ * on the target CPU.
+ *
+ * This is done to abstract us from the various ARM Architecture
+ * quirks and alphabet soup.
+ */
+
+/* __ARM_ARCH__ is a number corresponding to the ARM revision
+ * we're going to support. Our toolchain doesn't define __ARM_ARCH__
+ * so try to guess it.
+ */
+#ifndef __ARM_ARCH__
+#  if defined __ARM_ARCH_7__   || defined __ARM_ARCH_7A__ || \
+        defined __ARM_ARCH_7R__  || defined __ARM_ARCH_7M__
+#    define __ARM_ARCH__ 7
+#  elif defined __ARM_ARCH_6__   || defined __ARM_ARCH_6J__ || \
+        defined __ARM_ARCH_6K__  || defined __ARM_ARCH_6Z__ || \
+        defined __ARM_ARCH_6KZ__ || defined __ARM_ARCH_6T2__
+#    define __ARM_ARCH__ 6
+#  else
+#    error Unknown or unsupported ARM architecture
+#  endif
+#endif
+
+/* define __ARM_HAVE_HALFWORD_MULTIPLY when half-word multiply instructions
+ * this means variants of: smul, smulw, smla, smlaw, smlal
+ */
+#define  __ARM_HAVE_HALFWORD_MULTIPLY  1
+
+/* define __ARM_HAVE_LDREXD for ARMv7 architecture
+ * (also present in ARMv6K, but not implemented in ARMv7-M, neither of which
+ * we care about)
+ */
+#if __ARM_ARCH__ >= 7
+#  define __ARM_HAVE_LDREXD
+#endif
+
+/* define _ARM_HAVE_VFP if we have VFPv3
+ */
+#if __ARM_ARCH__ >= 7 && defined __VFP_FP__
+#  define __ARM_HAVE_VFP
+#endif
+
+/* define _ARM_HAVE_NEON for ARMv7 architecture if we support the
+ * Neon SIMD instruction set extensions. This also implies
+ * that VFPv3-D32 is supported.
+ */
+#if __ARM_ARCH__ >= 7 && defined __ARM_NEON__
+#  define __ARM_HAVE_NEON
+#endif
+
+#endif /* _ARM_MACHINE_CPU_FEATURES_H */
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/elf_machdep.h b/9/platforms/android-21/arch-arm/usr/include/machine/elf_machdep.h
new file mode 100644
index 0000000..97d8434
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/elf_machdep.h
@@ -0,0 +1,138 @@
+/*	$NetBSD: elf_machdep.h,v 1.10 2012/08/05 04:12:46 matt Exp $	*/
+
+#ifndef _ARM_ELF_MACHDEP_H_
+#define _ARM_ELF_MACHDEP_H_
+
+#if defined(__ARMEB__)
+#define ELF32_MACHDEP_ENDIANNESS	ELFDATA2MSB
+#else
+#define ELF32_MACHDEP_ENDIANNESS	ELFDATA2LSB
+#endif
+
+#define ELF64_MACHDEP_ENDIANNESS	XXX	/* break compilation */
+#define ELF64_MACHDEP_ID_CASES                                          \
+		/* no 64-bit ELF machine types supported */
+
+/* Processor specific flags for the ELF header e_flags field.  */
+#define EF_ARM_RELEXEC		0x00000001
+#define EF_ARM_HASENTRY		0x00000002
+#define EF_ARM_INTERWORK	0x00000004 /* GNU binutils 000413 */
+#define EF_ARM_SYMSARESORTED	0x00000004 /* ARM ELF A08 */
+#define EF_ARM_APCS_26		0x00000008 /* GNU binutils 000413 */
+#define EF_ARM_DYNSYMSUSESEGIDX	0x00000008 /* ARM ELF B01 */
+#define EF_ARM_APCS_FLOAT	0x00000010 /* GNU binutils 000413 */
+#define EF_ARM_MAPSYMSFIRST	0x00000010 /* ARM ELF B01 */
+#define EF_ARM_PIC		0x00000020
+#define EF_ARM_ALIGN8		0x00000040 /* 8-bit structure alignment.  */
+#define EF_ARM_NEW_ABI		0x00000080
+#define EF_ARM_OLD_ABI		0x00000100
+#define EF_ARM_SOFT_FLOAT	0x00000200
+#define EF_ARM_EABIMASK		0xff000000
+#define	EF_ARM_EABI_VER1	0x01000000
+#define	EF_ARM_EABI_VER2	0x02000000
+#define	EF_ARM_EABI_VER3	0x03000000
+#define	EF_ARM_EABI_VER4	0x04000000
+#define	EF_ARM_EABI_VER5	0x05000000
+
+#define	ELF32_MACHDEP_ID_CASES						\
+		case EM_ARM:						\
+			break;
+
+#define	ELF32_MACHDEP_ID	EM_ARM
+
+#define ARCH_ELFSIZE		32	/* MD native binary size */
+
+/* Processor specific relocation types */
+
+#define R_ARM_NONE		0
+#define R_ARM_PC24		1
+#define R_ARM_ABS32		2
+#define R_ARM_REL32		3
+#define R_ARM_PC13		4
+#define R_ARM_ABS16		5
+#define R_ARM_ABS12		6
+#define R_ARM_THM_ABS5		7
+#define R_ARM_ABS8		8
+#define R_ARM_SBREL32		9
+#define R_ARM_THM_PC22		10
+#define R_ARM_THM_PC8		11
+#define R_ARM_AMP_VCALL9	12
+#define R_ARM_SWI24		13
+#define R_ARM_THM_SWI8		14
+#define R_ARM_XPC25		15
+#define R_ARM_THM_XPC22		16
+
+/* TLS relocations */
+#define R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
+#define R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
+#define R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
+
+/* 20-31 are reserved for ARM Linux. */
+#define R_ARM_COPY		20
+#define R_ARM_GLOB_DAT		21
+#define	R_ARM_JUMP_SLOT		22
+#define R_ARM_RELATIVE		23
+#define	R_ARM_GOTOFF		24
+#define R_ARM_GOTPC		25
+#define R_ARM_GOT32		26
+#define R_ARM_PLT32		27
+
+#define R_ARM_ALU_PCREL_7_0	32
+#define R_ARM_ALU_PCREL_15_8	33
+#define R_ARM_ALU_PCREL_23_15	34
+#define R_ARM_ALU_SBREL_11_0	35
+#define R_ARM_ALU_SBREL_19_12	36
+#define R_ARM_ALU_SBREL_27_20	37
+
+/* 96-111 are reserved to G++. */
+#define R_ARM_GNU_VTENTRY	100
+#define R_ARM_GNU_VTINHERIT	101
+#define R_ARM_THM_PC11		102
+#define R_ARM_THM_PC9		103
+
+/* More TLS relocations */
+#define R_ARM_TLS_GD32		104	/* PC-rel 32 bit for global dynamic */
+#define R_ARM_TLS_LDM32		105	/* PC-rel 32 bit for local dynamic */
+#define R_ARM_TLS_LDO32		106	/* 32 bit offset relative to TLS */
+#define R_ARM_TLS_IE32		107	/* PC-rel 32 bit for GOT entry of */
+#define R_ARM_TLS_LE32		108
+#define R_ARM_TLS_LDO12		109
+#define R_ARM_TLS_LE12		110
+#define R_ARM_TLS_IE12GP	111
+
+/* 112-127 are reserved for private experiments. */
+
+#define R_ARM_RXPC25		249
+#define R_ARM_RSBREL32		250
+#define R_ARM_THM_RPC22		251
+#define R_ARM_RREL32		252
+#define R_ARM_RABS32		253
+#define R_ARM_RPC24		254
+#define R_ARM_RBASE		255
+
+#define R_TYPE(name)		__CONCAT(R_ARM_,name)
+
+/* Processor specific program header flags */
+#define PF_ARM_SB		0x10000000
+#define PF_ARM_PI		0x20000000
+#define PF_ARM_ENTRY		0x80000000
+
+/* Processor specific section header flags */
+#define SHF_ENTRYSECT		0x10000000
+#define SHF_COMDEF		0x80000000
+
+/* Processor specific symbol types */
+#define STT_ARM_TFUNC		STT_LOPROC
+
+#ifdef _KERNEL
+#ifdef ELFSIZE
+#define	ELF_MD_PROBE_FUNC	ELFNAME2(arm_netbsd,probe)
+#endif
+
+struct exec_package;
+
+int arm_netbsd_elf32_probe(struct lwp *, struct exec_package *, void *, char *,
+	vaddr_t *);
+#endif
+
+#endif /* _ARM_ELF_MACHDEP_H_ */
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/endian.h b/9/platforms/android-21/arch-arm/usr/include/machine/endian.h
new file mode 100644
index 0000000..f63e7b7
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/endian.h
@@ -0,0 +1,89 @@
+/*	$OpenBSD: endian.h,v 1.3 2005/12/13 00:35:23 millert Exp $	*/
+
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _ARM_ENDIAN_H_
+#define _ARM_ENDIAN_H_
+
+#ifdef __GNUC__
+
+/*
+ * REV and REV16 weren't available on ARM5 or ARM4.
+ * We don't include <machine/cpu-features.h> because it pollutes the
+ * namespace with macros like PLD.
+ */
+#if !defined __ARM_ARCH_5__ && !defined __ARM_ARCH_5T__ && \
+    !defined __ARM_ARCH_5TE__ && !defined __ARM_ARCH_5TEJ__ && \
+    !defined __ARM_ARCH_4T__ && !defined __ARM_ARCH_4__
+
+/* According to RealView Assembler User's Guide, REV and REV16 are available
+ * in Thumb code and 16-bit instructions when used in Thumb-2 code.
+ *
+ * REV Rd, Rm
+ *   Rd and Rm must both be Lo registers.
+ *
+ * REV16 Rd, Rm
+ *   Rd and Rm must both be Lo registers.
+ *
+ * The +l constraint takes care of this without constraining us in ARM mode.
+ */
+#define __swap16md(x) ({                                        \
+    register u_int16_t _x = (x);                                \
+    __asm__ __volatile__("rev16 %0, %0" : "+l" (_x));           \
+    _x;                                                         \
+})
+
+#define __swap32md(x) ({                                        \
+    register u_int32_t _x = (x);                                \
+    __asm__ __volatile__("rev %0, %0" : "+l" (_x));             \
+    _x;                                                         \
+})
+
+#define __swap64md(x) ({                                        \
+    u_int64_t _swap64md_x = (x);                                \
+    (u_int64_t) __swap32md(_swap64md_x >> 32) |                 \
+        (u_int64_t) __swap32md(_swap64md_x & 0xffffffff) << 32; \
+})
+
+/* Tell sys/endian.h we have MD variants of the swap macros.  */
+#define MD_SWAP
+
+#endif  /* __ARM_ARCH__ */
+#endif  /* __GNUC__ */
+
+#if defined(__ARMEB__)
+#define _BYTE_ORDER _BIG_ENDIAN
+#else
+#define _BYTE_ORDER _LITTLE_ENDIAN
+#endif
+#define __STRICT_ALIGNMENT
+#include <sys/types.h>
+#include <sys/endian.h>
+
+#endif  /* !_ARM_ENDIAN_H_ */
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/exec.h b/9/platforms/android-21/arch-arm/usr/include/machine/exec.h
new file mode 100644
index 0000000..227b207
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/exec.h
@@ -0,0 +1,50 @@
+/*	$OpenBSD: exec.h,v 1.9 2003/04/17 03:42:14 drahn Exp $	*/
+/*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1993 Christopher G. Demetriou
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_EXEC_H_
+#define _ARM_EXEC_H_
+
+#define __LDPGSZ	4096
+
+#define NATIVE_EXEC_ELF
+
+#define ARCH_ELFSIZE		32
+
+#define ELF_TARG_CLASS		ELFCLASS32
+#define ELF_TARG_DATA		ELFDATA2LSB
+#define ELF_TARG_MACH		EM_ARM
+
+#define _NLIST_DO_AOUT
+#define _NLIST_DO_ELF
+
+#define _KERN_DO_AOUT
+#define _KERN_DO_ELF
+
+#endif  /* _ARM_EXEC_H_ */
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/fenv.h b/9/platforms/android-21/arch-arm/usr/include/machine/fenv.h
new file mode 100644
index 0000000..0e483e3
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/fenv.h
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/lib/msun/arm/fenv.h,v 1.5 2005/03/16 19:03:45 das Exp $
+ */
+
+/*
+ * Rewritten for Android.
+ *
+ * The ARM FPSCR is described here:
+ * http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0344b/Chdfafia.html
+ */
+
+#ifndef _ARM_FENV_H_
+#define _ARM_FENV_H_
+
+#include <sys/types.h>
+
+__BEGIN_DECLS
+
+typedef __uint32_t fenv_t;
+typedef __uint32_t fexcept_t;
+
+/* Exception flags. */
+#define FE_INVALID    0x01
+#define FE_DIVBYZERO  0x02
+#define FE_OVERFLOW   0x04
+#define FE_UNDERFLOW  0x08
+#define FE_INEXACT    0x10
+#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_INEXACT | FE_INVALID | \
+                       FE_OVERFLOW | FE_UNDERFLOW)
+
+/* Rounding modes. */
+#define FE_TONEAREST  0x0
+#define FE_UPWARD     0x1
+#define FE_DOWNWARD   0x2
+#define FE_TOWARDZERO 0x3
+
+__END_DECLS
+
+#endif /* !_ARM_FENV_H_ */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h b/9/platforms/android-21/arch-arm/usr/include/machine/ieee.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h
copy to 9/platforms/android-21/arch-arm/usr/include/machine/ieee.h
diff --git a/9/platforms/android-21/arch-arm/usr/include/machine/setjmp.h b/9/platforms/android-21/arch-arm/usr/include/machine/setjmp.h
new file mode 100644
index 0000000..0941202
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/include/machine/setjmp.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * machine/setjmp.h: machine dependent setjmp-related information.
+ */
+
+/* _JBLEN is the size of a jmp_buf in longs.
+ * Do not modify this value or you will break the ABI !
+ *
+ * This value comes from the original OpenBSD ARM-specific header
+ * that was replaced by this one.
+ */
+#define _JBLEN  64
+
+/* According to the ARM AAPCS document, we only need to save
+ * the following registers:
+ *
+ *  Core   r4-r14
+ *
+ *  VFP    d8-d15  (see section 5.1.2.1)
+ *
+ *      Registers s16-s31 (d8-d15, q4-q7) must be preserved across subroutine
+ *      calls; registers s0-s15 (d0-d7, q0-q3) do not need to be preserved
+ *      (and can be used for passing arguments or returning results in standard
+ *      procedure-call variants). Registers d16-d31 (q8-q15), if present, do
+ *      not need to be preserved.
+ *
+ *  FPSCR  saved because GLibc does saves it too.
+ *
+ */
+
+/* The internal structure of a jmp_buf is totally private.
+ * Current layout (may change in the future):
+ *
+ * word   name         description
+ * 0      magic        magic number
+ * 1      sigmask      signal mask (not used with _setjmp / _longjmp)
+ * 2      float_base   base of float registers (d8 to d15)
+ * 18     float_state  floating-point status and control register
+ * 19     core_base    base of core registers (r4 to r14)
+ * 30     reserved     reserved entries (room to grow)
+ * 64
+ *
+ * NOTE: float_base must be at an even word index, since the
+ *       FP registers will be loaded/stored with instructions
+ *       that expect 8-byte alignment.
+ */
+
+#define _JB_MAGIC       0
+#define _JB_SIGMASK     (_JB_MAGIC+1)
+#define _JB_FLOAT_BASE  (_JB_SIGMASK+1)
+#define _JB_FLOAT_STATE (_JB_FLOAT_BASE + (15-8+1)*2)
+#define _JB_CORE_BASE   (_JB_FLOAT_STATE+1)
+
+#define _JB_MAGIC__SETJMP	0x4278f500
+#define _JB_MAGIC_SETJMP	0x4278f501
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h b/9/platforms/android-21/arch-arm/usr/include/machine/wchar_limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h
copy to 9/platforms/android-21/arch-arm/usr/include/machine/wchar_limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/malloc.h b/9/platforms/android-21/arch-arm/usr/include/malloc.h
similarity index 85%
rename from 9/platforms/android-19/arch-arm64/usr/include/malloc.h
rename to 9/platforms/android-21/arch-arm/usr/include/malloc.h
index 1e92b7d..e6ea276 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/malloc.h
+++ b/9/platforms/android-21/arch-arm/usr/include/malloc.h
@@ -27,19 +27,12 @@
 
 __BEGIN_DECLS
 
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
 extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
 extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
 extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
 extern void free(void* p);
+
+extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
 #ifndef STRUCT_MALLINFO_DECLARED
diff --git a/9/platforms/android-19/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-arm/usr/include/math.h
similarity index 99%
rename from 9/platforms/android-19/arch-arm64/usr/include/math.h
rename to 9/platforms/android-21/arch-arm/usr/include/math.h
index 8369d6e..e872388 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-arm/usr/include/math.h
@@ -512,7 +512,8 @@
 double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
 double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
 int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
+/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
 int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaCodec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaCodec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaCrypto.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaCrypto.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaDrm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaDrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaError.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaError.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaExtractor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaExtractor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaFormat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaFormat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h b/9/platforms/android-21/arch-arm/usr/include/media/NdkMediaMuxer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h
copy to 9/platforms/android-21/arch-arm/usr/include/media/NdkMediaMuxer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/memory.h b/9/platforms/android-21/arch-arm/usr/include/memory.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/memory.h
copy to 9/platforms/android-21/arch-arm/usr/include/memory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/mntent.h b/9/platforms/android-21/arch-arm/usr/include/mntent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/mntent.h
copy to 9/platforms/android-21/arch-arm/usr/include/mntent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h b/9/platforms/android-21/arch-arm/usr/include/net/ethernet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/ethernet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h b/9/platforms/android-21/arch-arm/usr/include/net/ethertypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/ethertypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if.h b/9/platforms/android-21/arch-arm/usr/include/net/if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h b/9/platforms/android-21/arch-arm/usr/include/net/if_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h b/9/platforms/android-21/arch-arm/usr/include/net/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h b/9/platforms/android-21/arch-arm/usr/include/net/if_ieee1394.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/if_ieee1394.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h b/9/platforms/android-21/arch-arm/usr/include/net/if_packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_types.h b/9/platforms/android-21/arch-arm/usr/include/net/if_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_types.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/if_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/route.h b/9/platforms/android-21/arch-arm/usr/include/net/route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/route.h
copy to 9/platforms/android-21/arch-arm/usr/include/net/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netdb.h b/9/platforms/android-21/arch-arm/usr/include/netdb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netdb.h
copy to 9/platforms/android-21/arch-arm/usr/include/netdb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h b/9/platforms/android-21/arch-arm/usr/include/netinet/ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h b/9/platforms/android-21/arch-arm/usr/include/netinet/icmp6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/icmp6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h b/9/platforms/android-21/arch-arm/usr/include/netinet/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in.h b/9/platforms/android-21/arch-arm/usr/include/netinet/in.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h b/9/platforms/android-21/arch-arm/usr/include/netinet/in6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h b/9/platforms/android-21/arch-arm/usr/include/netinet/in_systm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/in_systm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h b/9/platforms/android-21/arch-arm/usr/include/netinet/ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h b/9/platforms/android-21/arch-arm/usr/include/netinet/ip6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h b/9/platforms/android-21/arch-arm/usr/include/netinet/ip_icmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/ip_icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h b/9/platforms/android-21/arch-arm/usr/include/netinet/tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h b/9/platforms/android-21/arch-arm/usr/include/netinet/udp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h
copy to 9/platforms/android-21/arch-arm/usr/include/netinet/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h b/9/platforms/android-21/arch-arm/usr/include/netpacket/packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h
copy to 9/platforms/android-21/arch-arm/usr/include/netpacket/packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h b/9/platforms/android-21/arch-arm/usr/include/nsswitch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
copy to 9/platforms/android-21/arch-arm/usr/include/nsswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pathconf.h b/9/platforms/android-21/arch-arm/usr/include/pathconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pathconf.h
copy to 9/platforms/android-21/arch-arm/usr/include/pathconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/paths.h b/9/platforms/android-21/arch-arm/usr/include/paths.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/paths.h
copy to 9/platforms/android-21/arch-arm/usr/include/paths.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/poll.h b/9/platforms/android-21/arch-arm/usr/include/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/poll.h
copy to 9/platforms/android-21/arch-arm/usr/include/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pthread.h b/9/platforms/android-21/arch-arm/usr/include/pthread.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pthread.h
copy to 9/platforms/android-21/arch-arm/usr/include/pthread.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pwd.h b/9/platforms/android-21/arch-arm/usr/include/pwd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pwd.h
copy to 9/platforms/android-21/arch-arm/usr/include/pwd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/regex.h b/9/platforms/android-21/arch-arm/usr/include/regex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/regex.h
copy to 9/platforms/android-21/arch-arm/usr/include/regex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/resolv.h b/9/platforms/android-21/arch-arm/usr/include/resolv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/resolv.h
copy to 9/platforms/android-21/arch-arm/usr/include/resolv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sched.h b/9/platforms/android-21/arch-arm/usr/include/sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sched.h
copy to 9/platforms/android-21/arch-arm/usr/include/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/search.h b/9/platforms/android-21/arch-arm/usr/include/search.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/search.h
copy to 9/platforms/android-21/arch-arm/usr/include/search.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/semaphore.h b/9/platforms/android-21/arch-arm/usr/include/semaphore.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/semaphore.h
copy to 9/platforms/android-21/arch-arm/usr/include/semaphore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/setjmp.h b/9/platforms/android-21/arch-arm/usr/include/setjmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/setjmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/setjmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgidefs.h b/9/platforms/android-21/arch-arm/usr/include/sgidefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sgidefs.h
copy to 9/platforms/android-21/arch-arm/usr/include/sgidefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgtty.h b/9/platforms/android-21/arch-arm/usr/include/sgtty.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sgtty.h
copy to 9/platforms/android-21/arch-arm/usr/include/sgtty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/signal.h b/9/platforms/android-21/arch-arm/usr/include/signal.h
similarity index 98%
rename from 9/platforms/android-19/arch-arm64/usr/include/signal.h
rename to 9/platforms/android-21/arch-arm/usr/include/signal.h
index f1849c5..e23e65b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/signal.h
+++ b/9/platforms/android-21/arch-arm/usr/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h
similarity index 99%
rename from 9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
rename to 9/platforms/android-21/arch-arm/usr/include/stdatomic.h
index 3db25a7..58cb1bc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-arm/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
@@ -89,6 +89,7 @@
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_consume;
+using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdint.h b/9/platforms/android-21/arch-arm/usr/include/stdint.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdint.h
copy to 9/platforms/android-21/arch-arm/usr/include/stdint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdio.h b/9/platforms/android-21/arch-arm/usr/include/stdio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdio.h
copy to 9/platforms/android-21/arch-arm/usr/include/stdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-21/arch-arm/usr/include/stdlib.h
similarity index 96%
rename from 9/platforms/android-19/arch-arm64/usr/include/stdlib.h
rename to 9/platforms/android-21/arch-arm/usr/include/stdlib.h
index a0f017c..e04475c 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h
+++ b/9/platforms/android-21/arch-arm/usr/include/stdlib.h
@@ -76,8 +76,8 @@
 extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
 
 extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
+extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
+extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
 
 extern int atoi(const char*) __purefunc;
 extern long atol(const char*) __purefunc;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/string.h b/9/platforms/android-21/arch-arm/usr/include/string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/string.h
copy to 9/platforms/android-21/arch-arm/usr/include/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/strings.h b/9/platforms/android-21/arch-arm/usr/include/strings.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/strings.h
copy to 9/platforms/android-21/arch-arm/usr/include/strings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h b/9/platforms/android-21/arch-arm/usr/include/sys/auxv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/auxv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h b/9/platforms/android-21/arch-arm/usr/include/sys/cachectl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/cachectl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/capability.h b/9/platforms/android-21/arch-arm/usr/include/sys/capability.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/capability.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h b/9/platforms/android-21/arch-arm/usr/include/sys/cdefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/cdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h b/9/platforms/android-21/arch-arm/usr/include/sys/cdefs_elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/cdefs_elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h b/9/platforms/android-21/arch-arm/usr/include/sys/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h b/9/platforms/android-21/arch-arm/usr/include/sys/epoll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/epoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/errno.h b/9/platforms/android-21/arch-arm/usr/include/sys/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/errno.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h b/9/platforms/android-21/arch-arm/usr/include/sys/eventfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/eventfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/file.h b/9/platforms/android-21/arch-arm/usr/include/sys/file.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/file.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/file.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h b/9/platforms/android-21/arch-arm/usr/include/sys/fsuid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/fsuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h b/9/platforms/android-21/arch-arm/usr/include/sys/glibc-syscalls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/glibc-syscalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h b/9/platforms/android-21/arch-arm/usr/include/sys/inotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h b/9/platforms/android-21/arch-arm/usr/include/sys/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h b/9/platforms/android-21/arch-arm/usr/include/sys/ioctl_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ioctl_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h b/9/platforms/android-21/arch-arm/usr/include/sys/ipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/klog.h b/9/platforms/android-21/arch-arm/usr/include/sys/klog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/klog.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/klog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/limits.h b/9/platforms/android-21/arch-arm/usr/include/sys/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/limits.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mman.h b/9/platforms/android-21/arch-arm/usr/include/sys/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/mman.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mount.h b/9/platforms/android-21/arch-arm/usr/include/sys/mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/mount.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/msg.h b/9/platforms/android-21/arch-arm/usr/include/sys/msg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/msg.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/param.h b/9/platforms/android-21/arch-arm/usr/include/sys/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/param.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/personality.h b/9/platforms/android-21/arch-arm/usr/include/sys/personality.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/personality.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/poll.h b/9/platforms/android-21/arch-arm/usr/include/sys/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/poll.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h b/9/platforms/android-21/arch-arm/usr/include/sys/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h b/9/platforms/android-21/arch-arm/usr/include/sys/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/queue.h b/9/platforms/android-21/arch-arm/usr/include/sys/queue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/queue.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h b/9/platforms/android-21/arch-arm/usr/include/sys/reboot.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reg.h b/9/platforms/android-21/arch-arm/usr/include/sys/reg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/reg.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/resource.h b/9/platforms/android-21/arch-arm/usr/include/sys/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/resource.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/select.h b/9/platforms/android-21/arch-arm/usr/include/sys/select.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/select.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/select.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sem.h b/9/platforms/android-21/arch-arm/usr/include/sys/sem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sem.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h b/9/platforms/android-21/arch-arm/usr/include/sys/sendfile.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/sendfile.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/shm.h b/9/platforms/android-21/arch-arm/usr/include/sys/shm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/shm.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signal.h b/9/platforms/android-21/arch-arm/usr/include/sys/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/signal.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h b/9/platforms/android-21/arch-arm/usr/include/sys/signalfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socket.h b/9/platforms/android-21/arch-arm/usr/include/sys/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/socket.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h b/9/platforms/android-21/arch-arm/usr/include/sys/socketcalls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/socketcalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h b/9/platforms/android-21/arch-arm/usr/include/sys/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h b/9/platforms/android-21/arch-arm/usr/include/sys/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h b/9/platforms/android-21/arch-arm/usr/include/sys/statvfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/statvfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/swap.h b/9/platforms/android-21/arch-arm/usr/include/sys/swap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/swap.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/swap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h b/9/platforms/android-21/arch-arm/usr/include/sys/syscall.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/syscall.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h b/9/platforms/android-21/arch-arm/usr/include/sys/sysconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/sysconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h b/9/platforms/android-21/arch-arm/usr/include/sys/sysinfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h b/9/platforms/android-21/arch-arm/usr/include/sys/syslimits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/syslimits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h b/9/platforms/android-21/arch-arm/usr/include/sys/sysmacros.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/sysmacros.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h b/9/platforms/android-21/arch-arm/usr/include/sys/system_properties.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/system_properties.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/time.h b/9/platforms/android-21/arch-arm/usr/include/sys/time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/time.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h b/9/platforms/android-21/arch-arm/usr/include/sys/timerfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/timerfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/times.h b/9/platforms/android-21/arch-arm/usr/include/sys/times.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/times.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timex.h b/9/platforms/android-21/arch-arm/usr/include/sys/timex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/timex.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h b/9/platforms/android-21/arch-arm/usr/include/sys/ttychars.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ttychars.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h b/9/platforms/android-21/arch-arm/usr/include/sys/ttydefaults.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ttydefaults.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h b/9/platforms/android-21/arch-arm/usr/include/sys/ttydev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ttydev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/types.h b/9/platforms/android-21/arch-arm/usr/include/sys/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/types.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-arm/usr/include/sys/ucontext.h
similarity index 95%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/ucontext.h
index f62380d..dd2a0bb 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-21/arch-arm/usr/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -80,6 +78,10 @@
 
 #elif defined(__aarch64__)
 
+#define NGREG 34 /* x0..x30 + sp + pc + pstate */
+typedef unsigned long greg_t;
+typedef greg_t gregset_t[NGREG];
+
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -152,11 +154,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/uio.h b/9/platforms/android-21/arch-arm/usr/include/sys/uio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/uio.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/un.h b/9/platforms/android-21/arch-arm/usr/include/sys/un.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/un.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/user.h b/9/platforms/android-21/arch-arm/usr/include/sys/user.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/user.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/user.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utime.h b/9/platforms/android-21/arch-arm/usr/include/sys/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/utime.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h b/9/platforms/android-21/arch-arm/usr/include/sys/utsname.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h b/9/platforms/android-21/arch-arm/usr/include/sys/vfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/vfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vt.h b/9/platforms/android-21/arch-arm/usr/include/sys/vt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/vt.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/wait.h b/9/platforms/android-21/arch-arm/usr/include/sys/wait.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/wait.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h b/9/platforms/android-21/arch-arm/usr/include/sys/xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h
copy to 9/platforms/android-21/arch-arm/usr/include/sys/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/syslog.h b/9/platforms/android-21/arch-arm/usr/include/syslog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/syslog.h
copy to 9/platforms/android-21/arch-arm/usr/include/syslog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termio.h b/9/platforms/android-21/arch-arm/usr/include/termio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/termio.h
copy to 9/platforms/android-21/arch-arm/usr/include/termio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termios.h b/9/platforms/android-21/arch-arm/usr/include/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/termios.h
copy to 9/platforms/android-21/arch-arm/usr/include/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/thread_db.h b/9/platforms/android-21/arch-arm/usr/include/thread_db.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/thread_db.h
copy to 9/platforms/android-21/arch-arm/usr/include/thread_db.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time.h b/9/platforms/android-21/arch-arm/usr/include/time.h
similarity index 91%
rename from 9/platforms/android-19/arch-arm64/usr/include/time.h
rename to 9/platforms/android-21/arch-arm/usr/include/time.h
index 0a5f18b..aa72fcc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/time.h
+++ b/9/platforms/android-21/arch-arm/usr/include/time.h
@@ -85,8 +85,10 @@
 
 extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
 
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__;
 
 extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
 extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time64.h b/9/platforms/android-21/arch-arm/usr/include/time64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/time64.h
copy to 9/platforms/android-21/arch-arm/usr/include/time64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/uchar.h b/9/platforms/android-21/arch-arm/usr/include/uchar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/uchar.h
copy to 9/platforms/android-21/arch-arm/usr/include/uchar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ucontext.h b/9/platforms/android-21/arch-arm/usr/include/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ucontext.h
copy to 9/platforms/android-21/arch-arm/usr/include/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/unistd.h b/9/platforms/android-21/arch-arm/usr/include/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/unistd.h
copy to 9/platforms/android-21/arch-arm/usr/include/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/util.h b/9/platforms/android-21/arch-arm/usr/include/util.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/util.h
copy to 9/platforms/android-21/arch-arm/usr/include/util.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utime.h b/9/platforms/android-21/arch-arm/usr/include/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/utime.h
copy to 9/platforms/android-21/arch-arm/usr/include/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utmp.h b/9/platforms/android-21/arch-arm/usr/include/utmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/utmp.h
copy to 9/platforms/android-21/arch-arm/usr/include/utmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-21/arch-arm/usr/include/wchar.h
similarity index 99%
rename from 9/platforms/android-19/arch-arm64/usr/include/wchar.h
rename to 9/platforms/android-21/arch-arm/usr/include/wchar.h
index f421d4c..cfa9b74 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-21/arch-arm/usr/include/wchar.h
@@ -151,8 +151,8 @@
 extern int               wprintf(const wchar_t *, ...);
 extern int               wscanf(const wchar_t *, ...);
 
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
+extern long long          wcstoll_l(const wchar_t *, wchar_t **, int, locale_t);
+extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t);
 extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
 
 extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wctype.h b/9/platforms/android-21/arch-arm/usr/include/wctype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/wctype.h
copy to 9/platforms/android-21/arch-arm/usr/include/wctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/xlocale.h b/9/platforms/android-21/arch-arm/usr/include/xlocale.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/xlocale.h
copy to 9/platforms/android-21/arch-arm/usr/include/xlocale.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zconf.h b/9/platforms/android-21/arch-arm/usr/include/zconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/zconf.h
copy to 9/platforms/android-21/arch-arm/usr/include/zconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zlib.h b/9/platforms/android-21/arch-arm/usr/include/zlib.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/zlib.h
copy to 9/platforms/android-21/arch-arm/usr/include/zlib.h
diff --git a/9/platforms/android-21/arch-arm/usr/lib/crtbegin_dynamic.o b/9/platforms/android-21/arch-arm/usr/lib/crtbegin_dynamic.o
new file mode 100644
index 0000000..4a1de0a
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/crtbegin_so.o b/9/platforms/android-21/arch-arm/usr/lib/crtbegin_so.o
new file mode 100644
index 0000000..5af6cf6
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/crtbegin_static.o b/9/platforms/android-21/arch-arm/usr/lib/crtbegin_static.o
new file mode 100644
index 0000000..3570ff6
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/crtend_android.o b/9/platforms/android-21/arch-arm/usr/lib/crtend_android.o
new file mode 100644
index 0000000..50caf05
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/crtend_so.o b/9/platforms/android-21/arch-arm/usr/lib/crtend_so.o
new file mode 100644
index 0000000..1dc5dae
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libEGL.so b/9/platforms/android-21/arch-arm/usr/lib/libEGL.so
new file mode 100755
index 0000000..c93a0e9
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libEGL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libGLESv1_CM.so b/9/platforms/android-21/arch-arm/usr/lib/libGLESv1_CM.so
new file mode 100755
index 0000000..a8c3f26
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libGLESv2.so b/9/platforms/android-21/arch-arm/usr/lib/libGLESv2.so
new file mode 100755
index 0000000..efa96f9
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libGLESv3.so b/9/platforms/android-21/arch-arm/usr/lib/libGLESv3.so
new file mode 100755
index 0000000..89ff5a5
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libOpenMAXAL.so b/9/platforms/android-21/arch-arm/usr/lib/libOpenMAXAL.so
new file mode 100755
index 0000000..e045cfc
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libOpenSLES.so b/9/platforms/android-21/arch-arm/usr/lib/libOpenSLES.so
new file mode 100755
index 0000000..3f000fb
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libandroid.so b/9/platforms/android-21/arch-arm/usr/lib/libandroid.so
new file mode 100755
index 0000000..253e4b3
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libandroid.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libc.a b/9/platforms/android-21/arch-arm/usr/lib/libc.a
new file mode 100644
index 0000000..fb3ee8c
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libc.so b/9/platforms/android-21/arch-arm/usr/lib/libc.so
new file mode 100755
index 0000000..a44e24d
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libc.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libdl.so b/9/platforms/android-21/arch-arm/usr/lib/libdl.so
new file mode 100755
index 0000000..48922ff
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libdl.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libjnigraphics.so b/9/platforms/android-21/arch-arm/usr/lib/libjnigraphics.so
new file mode 100755
index 0000000..35cc17f
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/liblog.so b/9/platforms/android-21/arch-arm/usr/lib/liblog.so
new file mode 100755
index 0000000..0836286
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/liblog.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libm.a b/9/platforms/android-21/arch-arm/usr/lib/libm.a
new file mode 100644
index 0000000..9429fb5
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libm.a
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libm.so b/9/platforms/android-21/arch-arm/usr/lib/libm.so
new file mode 100755
index 0000000..c046665
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libm.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libm_hard.a b/9/platforms/android-21/arch-arm/usr/lib/libm_hard.a
new file mode 100644
index 0000000..1ab948e
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libm_hard.a
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libmediandk.so b/9/platforms/android-21/arch-arm/usr/lib/libmediandk.so
new file mode 100755
index 0000000..eca4dfb
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libstdc++.a b/9/platforms/android-21/arch-arm/usr/lib/libstdc++.a
new file mode 100644
index 0000000..698f3d6
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libstdc++.so b/9/platforms/android-21/arch-arm/usr/lib/libstdc++.so
new file mode 100755
index 0000000..c144885
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libthread_db.so b/9/platforms/android-21/arch-arm/usr/lib/libthread_db.so
new file mode 100755
index 0000000..8ba74f9
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libthread_db.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libz.a b/9/platforms/android-21/arch-arm/usr/lib/libz.a
new file mode 100644
index 0000000..fd67a52
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libz.a
Binary files differ
diff --git a/9/platforms/android-21/arch-arm/usr/lib/libz.so b/9/platforms/android-21/arch-arm/usr/lib/libz.so
new file mode 100755
index 0000000..0ef4d2d
--- /dev/null
+++ b/9/platforms/android-21/arch-arm/usr/lib/libz.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h b/9/platforms/android-21/arch-arm64/usr/include/EGL/egl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/EGL/egl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h b/9/platforms/android-21/arch-arm64/usr/include/EGL/eglext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/EGL/eglext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h b/9/platforms/android-21/arch-arm64/usr/include/EGL/eglplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/EGL/eglplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h b/9/platforms/android-21/arch-arm64/usr/include/GLES/gl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES/gl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h b/9/platforms/android-21/arch-arm64/usr/include/GLES/glext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES/glext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h b/9/platforms/android-21/arch-arm64/usr/include/GLES/glplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES/glplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h b/9/platforms/android-21/arch-arm64/usr/include/GLES2/gl2.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES2/gl2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h b/9/platforms/android-21/arch-arm64/usr/include/GLES2/gl2ext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES2/gl2ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h b/9/platforms/android-21/arch-arm64/usr/include/GLES2/gl2platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES2/gl2platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h b/9/platforms/android-21/arch-arm64/usr/include/GLES3/gl3.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES3/gl3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h b/9/platforms/android-21/arch-arm64/usr/include/GLES3/gl31.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES3/gl31.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h b/9/platforms/android-21/arch-arm64/usr/include/GLES3/gl3ext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES3/gl3ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h b/9/platforms/android-21/arch-arm64/usr/include/GLES3/gl3platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/GLES3/gl3platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h b/9/platforms/android-21/arch-arm64/usr/include/KHR/khrplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/KHR/khrplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h b/9/platforms/android-21/arch-arm64/usr/include/OMXAL/OpenMAXAL.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h
rename to 9/platforms/android-21/arch-arm64/usr/include/OMXAL/OpenMAXAL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-21/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h
rename to 9/platforms/android-21/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h b/9/platforms/android-21/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h b/9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h
rename to 9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_Android.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h
rename to 9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h b/9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
rename to 9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h b/9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h
rename to 9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h b/9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_Platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h
rename to 9/platforms/android-21/arch-arm64/usr/include/SLES/OpenSLES_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/alloca.h b/9/platforms/android-21/arch-arm64/usr/include/alloca.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/alloca.h
rename to 9/platforms/android-21/arch-arm64/usr/include/alloca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h b/9/platforms/android-21/arch-arm64/usr/include/android/api-level.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
copy to 9/platforms/android-21/arch-arm64/usr/include/android/api-level.h
index 9e9c3d6..649efd6 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/android/api-level.h
@@ -28,6 +28,6 @@
 #ifndef ANDROID_API_LEVEL_H
 #define ANDROID_API_LEVEL_H
 
-#define __ANDROID_API__ 19
+#define __ANDROID_API__ 21
 
 #endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h b/9/platforms/android-21/arch-arm64/usr/include/android/asset_manager.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/asset_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h b/9/platforms/android-21/arch-arm64/usr/include/android/asset_manager_jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/asset_manager_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h b/9/platforms/android-21/arch-arm64/usr/include/android/bitmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/configuration.h b/9/platforms/android-21/arch-arm64/usr/include/android/configuration.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/configuration.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/configuration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h b/9/platforms/android-21/arch-arm64/usr/include/android/dlext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/dlext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/dlext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/input.h b/9/platforms/android-21/arch-arm64/usr/include/android/input.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/input.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/input.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h b/9/platforms/android-21/arch-arm64/usr/include/android/keycodes.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/keycodes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/log.h b/9/platforms/android-21/arch-arm64/usr/include/android/log.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/log.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/looper.h b/9/platforms/android-21/arch-arm64/usr/include/android/looper.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/looper.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/looper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h b/9/platforms/android-21/arch-arm64/usr/include/android/native_activity.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/native_activity.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window.h b/9/platforms/android-21/arch-arm64/usr/include/android/native_window.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/native_window.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/native_window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h b/9/platforms/android-21/arch-arm64/usr/include/android/native_window_jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/native_window_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/obb.h b/9/platforms/android-21/arch-arm64/usr/include/android/obb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/obb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/obb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/rect.h b/9/platforms/android-21/arch-arm64/usr/include/android/rect.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/rect.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/rect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/sensor.h b/9/platforms/android-21/arch-arm64/usr/include/android/sensor.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/sensor.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/sensor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h b/9/platforms/android-21/arch-arm64/usr/include/android/storage_manager.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/storage_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/tts.h b/9/platforms/android-21/arch-arm64/usr/include/android/tts.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/tts.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/tts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/window.h b/9/platforms/android-21/arch-arm64/usr/include/android/window.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/android/window.h
rename to 9/platforms/android-21/arch-arm64/usr/include/android/window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ar.h b/9/platforms/android-21/arch-arm64/usr/include/ar.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/ar.h
rename to 9/platforms/android-21/arch-arm64/usr/include/ar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h b/9/platforms/android-21/arch-arm64/usr/include/arpa/inet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/arpa/inet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h b/9/platforms/android-21/arch-arm64/usr/include/arpa/nameser.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h
rename to 9/platforms/android-21/arch-arm64/usr/include/arpa/nameser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h b/9/platforms/android-21/arch-arm64/usr/include/arpa/nameser_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/arpa/nameser_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h b/9/platforms/android-21/arch-arm64/usr/include/arpa/telnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/arpa/telnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/bitsperlong.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/bitsperlong.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/errno-base.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/errno-base.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/int-l64.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/int-l64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/int-ll64.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/int-ll64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/ipcbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/ipcbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/mman-common.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/mman-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/msgbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/msgbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/sembuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/sembuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/setup.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/setup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/shmbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/shmbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/shmparam.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/shmparam.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/siginfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/siginfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/signal-defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/signal-defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/termbits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h b/9/platforms/android-21/arch-arm64/usr/include/asm-generic/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm-generic/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/a.out.h b/9/platforms/android-21/arch-arm64/usr/include/asm/a.out.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/a.out.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/a.out.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/auxvec.h b/9/platforms/android-21/arch-arm64/usr/include/asm/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/auxvec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/bitsperlong.h b/9/platforms/android-21/arch-arm64/usr/include/asm/bitsperlong.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/bitsperlong.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/bitsperlong.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/byteorder.h b/9/platforms/android-21/arch-arm64/usr/include/asm/byteorder.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/byteorder.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/byteorder.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/errno.h b/9/platforms/android-21/arch-arm64/usr/include/asm/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/errno.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/fcntl.h b/9/platforms/android-21/arch-arm64/usr/include/asm/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/fcntl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/hwcap.h b/9/platforms/android-21/arch-arm64/usr/include/asm/hwcap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/hwcap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/hwcap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/asm/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ioctls.h b/9/platforms/android-21/arch-arm64/usr/include/asm/ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/ioctls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm/ipcbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/ipcbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/kvm.h b/9/platforms/android-21/arch-arm64/usr/include/asm/kvm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/kvm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/kvm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/kvm_para.h b/9/platforms/android-21/arch-arm64/usr/include/asm/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/kvm_para.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/mman.h b/9/platforms/android-21/arch-arm64/usr/include/asm/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/mman.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/msgbuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm/msgbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/msgbuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/msgbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/param.h b/9/platforms/android-21/arch-arm64/usr/include/asm/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/param.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/poll.h b/9/platforms/android-21/arch-arm64/usr/include/asm/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/poll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/posix_types.h b/9/platforms/android-21/arch-arm64/usr/include/asm/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/posix_types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ptrace.h b/9/platforms/android-21/arch-arm64/usr/include/asm/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/ptrace.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/resource.h b/9/platforms/android-21/arch-arm64/usr/include/asm/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/resource.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/sembuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm/sembuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/sembuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/sembuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/setup.h b/9/platforms/android-21/arch-arm64/usr/include/asm/setup.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/setup.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/setup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/shmbuf.h b/9/platforms/android-21/arch-arm64/usr/include/asm/shmbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/shmbuf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/shmbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/sigcontext.h b/9/platforms/android-21/arch-arm64/usr/include/asm/sigcontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/sigcontext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/sigcontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/siginfo.h b/9/platforms/android-21/arch-arm64/usr/include/asm/siginfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/siginfo.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/siginfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/signal.h b/9/platforms/android-21/arch-arm64/usr/include/asm/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/signal.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/socket.h b/9/platforms/android-21/arch-arm64/usr/include/asm/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/socket.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/sockios.h b/9/platforms/android-21/arch-arm64/usr/include/asm/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/sockios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/stat.h b/9/platforms/android-21/arch-arm64/usr/include/asm/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/stat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/statfs.h b/9/platforms/android-21/arch-arm64/usr/include/asm/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/statfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/swab.h b/9/platforms/android-21/arch-arm64/usr/include/asm/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/swab.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/termbits.h b/9/platforms/android-21/arch-arm64/usr/include/asm/termbits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/termbits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/termios.h b/9/platforms/android-21/arch-arm64/usr/include/asm/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/termios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/types.h b/9/platforms/android-21/arch-arm64/usr/include/asm/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/unistd.h b/9/platforms/android-21/arch-arm64/usr/include/asm/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/asm/unistd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/asm/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/assert.h b/9/platforms/android-21/arch-arm64/usr/include/assert.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/assert.h
rename to 9/platforms/android-21/arch-arm64/usr/include/assert.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/byteswap.h b/9/platforms/android-21/arch-arm64/usr/include/byteswap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/byteswap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/byteswap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/complex.h b/9/platforms/android-21/arch-arm64/usr/include/complex.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/complex.h
rename to 9/platforms/android-21/arch-arm64/usr/include/complex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ctype.h b/9/platforms/android-21/arch-arm64/usr/include/ctype.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/ctype.h
rename to 9/platforms/android-21/arch-arm64/usr/include/ctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dirent.h b/9/platforms/android-21/arch-arm64/usr/include/dirent.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/dirent.h
rename to 9/platforms/android-21/arch-arm64/usr/include/dirent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dlfcn.h b/9/platforms/android-21/arch-arm64/usr/include/dlfcn.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/dlfcn.h
rename to 9/platforms/android-21/arch-arm64/usr/include/dlfcn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/elf.h b/9/platforms/android-21/arch-arm64/usr/include/elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/elf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/endian.h b/9/platforms/android-21/arch-arm64/usr/include/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/endian.h
rename to 9/platforms/android-21/arch-arm64/usr/include/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/err.h b/9/platforms/android-21/arch-arm64/usr/include/err.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/err.h
rename to 9/platforms/android-21/arch-arm64/usr/include/err.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/errno.h b/9/platforms/android-21/arch-arm64/usr/include/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/errno.h
rename to 9/platforms/android-21/arch-arm64/usr/include/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fcntl.h b/9/platforms/android-21/arch-arm64/usr/include/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/fcntl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/features.h b/9/platforms/android-21/arch-arm64/usr/include/features.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/features.h
rename to 9/platforms/android-21/arch-arm64/usr/include/features.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fenv.h b/9/platforms/android-21/arch-arm64/usr/include/fenv.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/fenv.h
rename to 9/platforms/android-21/arch-arm64/usr/include/fenv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fnmatch.h b/9/platforms/android-21/arch-arm64/usr/include/fnmatch.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/fnmatch.h
rename to 9/platforms/android-21/arch-arm64/usr/include/fnmatch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fts.h b/9/platforms/android-21/arch-arm64/usr/include/fts.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/fts.h
rename to 9/platforms/android-21/arch-arm64/usr/include/fts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ftw.h b/9/platforms/android-21/arch-arm64/usr/include/ftw.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/ftw.h
rename to 9/platforms/android-21/arch-arm64/usr/include/ftw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/getopt.h b/9/platforms/android-21/arch-arm64/usr/include/getopt.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/getopt.h
rename to 9/platforms/android-21/arch-arm64/usr/include/getopt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/grp.h b/9/platforms/android-21/arch-arm64/usr/include/grp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/grp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/grp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/inttypes.h b/9/platforms/android-21/arch-arm64/usr/include/inttypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/inttypes.h
rename to 9/platforms/android-21/arch-arm64/usr/include/inttypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/jni.h b/9/platforms/android-21/arch-arm64/usr/include/jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/jni.h
rename to 9/platforms/android-21/arch-arm64/usr/include/jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/lastlog.h b/9/platforms/android-21/arch-arm64/usr/include/lastlog.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/lastlog.h
rename to 9/platforms/android-21/arch-arm64/usr/include/lastlog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/libgen.h b/9/platforms/android-21/arch-arm64/usr/include/libgen.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/libgen.h
rename to 9/platforms/android-21/arch-arm64/usr/include/libgen.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/limits.h b/9/platforms/android-21/arch-arm64/usr/include/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/limits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/link.h b/9/platforms/android-21/arch-arm64/usr/include/link.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/link.h
rename to 9/platforms/android-21/arch-arm64/usr/include/link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h b/9/platforms/android-21/arch-arm64/usr/include/linux/a.out.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/a.out.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/acct.h b/9/platforms/android-21/arch-arm64/usr/include/linux/acct.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/acct.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/adb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/adb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/adb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/adfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/adfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h b/9/platforms/android-21/arch-arm64/usr/include/linux/affs_hardblocks.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/affs_hardblocks.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h b/9/platforms/android-21/arch-arm64/usr/include/linux/agpgart.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/agpgart.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/aio_abi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/aio_abi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/android_alarm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/android_alarm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h b/9/platforms/android-21/arch-arm64/usr/include/linux/apm_bios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/apm_bios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/arcfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/arcfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ashmem.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ashmem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atalk.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm_eni.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm_eni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm_he.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm_he.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm_idt77105.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm_idt77105.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm_nicstar.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm_nicstar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm_tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atm_zatm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atm_zatm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmapi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmarp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmarp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmbr2684.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmbr2684.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmclip.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmclip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmioc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmioc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmlec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmlec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmmpc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmmpc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmsap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmsap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/atmsvc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/atmsvc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/audit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/audit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/audit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/audit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/auto_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/auto_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h b/9/platforms/android-21/arch-arm64/usr/include/linux/auto_fs4.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/auto_fs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h b/9/platforms/android-21/arch-arm64/usr/include/linux/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ax25.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ax25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h b/9/platforms/android-21/arch-arm64/usr/include/linux/b1lli.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/b1lli.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h b/9/platforms/android-21/arch-arm64/usr/include/linux/baycom.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/baycom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h b/9/platforms/android-21/arch-arm64/usr/include/linux/bcache.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/bcache.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/bcm933xx_hcs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/bcm933xx_hcs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/bfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/bfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binder.h b/9/platforms/android-21/arch-arm64/usr/include/linux/binder.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/binder.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/binder.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h b/9/platforms/android-21/arch-arm64/usr/include/linux/binfmts.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/binfmts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/blkpg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/blkpg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h b/9/platforms/android-21/arch-arm64/usr/include/linux/blktrace_api.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/blktrace_api.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h b/9/platforms/android-21/arch-arm64/usr/include/linux/bpqether.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/bpqether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/bsg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/bsg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/btrfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/btrfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h b/9/platforms/android-21/arch-arm64/usr/include/linux/byteorder/big_endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/byteorder/big_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h b/9/platforms/android-21/arch-arm64/usr/include/linux/byteorder/little_endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/byteorder/little_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h b/9/platforms/android-21/arch-arm64/usr/include/linux/caif/caif_socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/caif/caif_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h b/9/platforms/android-21/arch-arm64/usr/include/linux/caif/if_caif.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/caif/if_caif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can.h b/9/platforms/android-21/arch-arm64/usr/include/linux/can.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/can.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/can.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/can/bcm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/can/bcm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h b/9/platforms/android-21/arch-arm64/usr/include/linux/can/error.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/can/error.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h b/9/platforms/android-21/arch-arm64/usr/include/linux/can/gw.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/can/gw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/can/netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/can/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h b/9/platforms/android-21/arch-arm64/usr/include/linux/can/raw.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/can/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capability.h b/9/platforms/android-21/arch-arm64/usr/include/linux/capability.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/capability.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/capi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/capi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/capi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cciss_defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cciss_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cciss_ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cciss_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cdrom.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cdrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cgroupstats.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cgroupstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/chio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/chio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/chio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/chio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cifs/cifs_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cifs/cifs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cm4000_cs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cm4000_cs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cn_proc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cn_proc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda.h b/9/platforms/android-21/arch-arm64/usr/include/linux/coda.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/coda.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/coda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/coda_psdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/coda_psdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coff.h b/9/platforms/android-21/arch-arm64/usr/include/linux/coff.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/coff.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/coff.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h b/9/platforms/android-21/arch-arm64/usr/include/linux/compiler.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/compiler.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/connector.h b/9/platforms/android-21/arch-arm64/usr/include/linux/connector.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/connector.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/connector.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/const.h b/9/platforms/android-21/arch-arm64/usr/include/linux/const.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/const.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/const.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cramfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cramfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cuda.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cuda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cyclades.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cyclades.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/cycx_cfm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/cycx_cfm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dcbnl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dcbnl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dccp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dlm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dlm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dlm_device.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dlm_device.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dlm_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dlm_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dlm_plock.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dlm_plock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dlmconstants.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dlmconstants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dm-ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dm-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dm-log-userspace.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dm-log-userspace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dn.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dn.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dn.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dqblk_xfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dqblk_xfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/audio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/ca.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/ca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/dmx.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/dmx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/frontend.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/frontend.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/net.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/osd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/osd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/version.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h b/9/platforms/android-21/arch-arm64/usr/include/linux/dvb/video.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/dvb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/edd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/edd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/edd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/edd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/efs_fs_sb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/efs_fs_sb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h b/9/platforms/android-21/arch-arm64/usr/include/linux/elf-em.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/elf-em.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h b/9/platforms/android-21/arch-arm64/usr/include/linux/elf-fdpic.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/elf-fdpic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf.h b/9/platforms/android-21/arch-arm64/usr/include/linux/elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/elf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h b/9/platforms/android-21/arch-arm64/usr/include/linux/elfcore.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/elfcore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errno.h b/9/platforms/android-21/arch-arm64/usr/include/linux/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/errno.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h b/9/platforms/android-21/arch-arm64/usr/include/linux/errqueue.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/errqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ethtool.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ethtool.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h b/9/platforms/android-21/arch-arm64/usr/include/linux/eventpoll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/eventpoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fadvise.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fadvise.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/falloc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/falloc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fanotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fanotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fdreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fib_rules.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fib_rules.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fiemap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fiemap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/filter.h b/9/platforms/android-21/arch-arm64/usr/include/linux/filter.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/filter.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/filter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/firewire-cdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/firewire-cdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h b/9/platforms/android-21/arch-arm64/usr/include/linux/firewire-constants.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/firewire-constants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/flat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/flat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/flat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/flat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fsl_hypervisor.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fsl_hypervisor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h b/9/platforms/android-21/arch-arm64/usr/include/linux/fuse.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/fuse.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/futex.h b/9/platforms/android-21/arch-arm64/usr/include/linux/futex.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/futex.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/futex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h b/9/platforms/android-21/arch-arm64/usr/include/linux/gameport.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/gameport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h b/9/platforms/android-21/arch-arm64/usr/include/linux/gen_stats.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/gen_stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/genetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/genetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h b/9/platforms/android-21/arch-arm64/usr/include/linux/genwqe/genwqe_card.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/genwqe/genwqe_card.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h b/9/platforms/android-21/arch-arm64/usr/include/linux/gfs2_ondisk.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/gfs2_ondisk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/gigaset_dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/gigaset_dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hash_info.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hash_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hdlc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hdlc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hdlc/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hdlc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hdlcdrv.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hdlcdrv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hdreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hid.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hid.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hid.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hiddev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hiddev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hidraw.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hidraw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hpet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hpet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hsi/hsi_char.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hsi/hsi_char.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hsr_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hsr_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hw_breakpoint.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h b/9/platforms/android-21/arch-arm64/usr/include/linux/hysdn_if.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/hysdn_if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/i2c-dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/i2c-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h b/9/platforms/android-21/arch-arm64/usr/include/linux/i2c.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/i2c.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/i2o-dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/i2o-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h b/9/platforms/android-21/arch-arm64/usr/include/linux/i8k.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/i8k.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/icmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h b/9/platforms/android-21/arch-arm64/usr/include/linux/icmpv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/icmpv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_addr.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_addr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_addrlabel.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_addrlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_alg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_alg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_arcnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_arcnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_bonding.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_bonding.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_bridge.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_cablemodem.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_cablemodem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_eql.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_eql.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_fc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_fc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_fddi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_fddi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_frad.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_frad.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_hippi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_hippi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_infiniband.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_infiniband.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_link.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_ltalk.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_ltalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_phonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_plip.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_plip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_ppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_pppol2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_pppol2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_pppolac.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_pppolac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_pppopns.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_pppopns.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_pppox.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_pppox.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_slip.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_slip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_team.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_team.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_tun.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_tun.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_tunnel.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_vlan.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h b/9/platforms/android-21/arch-arm64/usr/include/linux/if_x25.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/if_x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/igmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/igmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in.h b/9/platforms/android-21/arch-arm64/usr/include/linux/in.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/in.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in6.h b/9/platforms/android-21/arch-arm64/usr/include/linux/in6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/in6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h b/9/platforms/android-21/arch-arm64/usr/include/linux/in_route.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/in_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h b/9/platforms/android-21/arch-arm64/usr/include/linux/inet_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/inet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h b/9/platforms/android-21/arch-arm64/usr/include/linux/inotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h b/9/platforms/android-21/arch-arm64/usr/include/linux/input.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/input.h
copy to 9/platforms/android-21/arch-arm64/usr/include/linux/input.h
index df3200c..b9d5b2a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/linux/input.h
@@ -97,629 +97,644 @@
 #define INPUT_PROP_BUTTONPAD 0x02
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define INPUT_PROP_SEMI_MT 0x03
+#define INPUT_PROP_TOPBUTTONPAD 0x04
 #define INPUT_PROP_MAX 0x1f
 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_SYN 0x00
 #define EV_KEY 0x01
 #define EV_REL 0x02
 #define EV_ABS 0x03
-#define EV_MSC 0x04
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MSC 0x04
 #define EV_SW 0x05
 #define EV_LED 0x11
 #define EV_SND 0x12
-#define EV_REP 0x14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_REP 0x14
 #define EV_FF 0x15
 #define EV_PWR 0x16
 #define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MAX 0x1f
 #define EV_CNT (EV_MAX+1)
 #define SYN_REPORT 0
 #define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SYN_MT_REPORT 2
 #define SYN_DROPPED 3
 #define SYN_MAX 0xf
 #define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RESERVED 0
 #define KEY_ESC 1
 #define KEY_1 2
 #define KEY_2 3
-#define KEY_3 4
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_3 4
 #define KEY_4 5
 #define KEY_5 6
 #define KEY_6 7
-#define KEY_7 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_7 8
 #define KEY_8 9
 #define KEY_9 10
 #define KEY_0 11
-#define KEY_MINUS 12
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MINUS 12
 #define KEY_EQUAL 13
 #define KEY_BACKSPACE 14
 #define KEY_TAB 15
-#define KEY_Q 16
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Q 16
 #define KEY_W 17
 #define KEY_E 18
 #define KEY_R 19
-#define KEY_T 20
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_T 20
 #define KEY_Y 21
 #define KEY_U 22
 #define KEY_I 23
-#define KEY_O 24
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_O 24
 #define KEY_P 25
 #define KEY_LEFTBRACE 26
 #define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ENTER 28
 #define KEY_LEFTCTRL 29
 #define KEY_A 30
 #define KEY_S 31
-#define KEY_D 32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_D 32
 #define KEY_F 33
 #define KEY_G 34
 #define KEY_H 35
-#define KEY_J 36
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_J 36
 #define KEY_K 37
 #define KEY_L 38
 #define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_APOSTROPHE 40
 #define KEY_GRAVE 41
 #define KEY_LEFTSHIFT 42
 #define KEY_BACKSLASH 43
-#define KEY_Z 44
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Z 44
 #define KEY_X 45
 #define KEY_C 46
 #define KEY_V 47
-#define KEY_B 48
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_B 48
 #define KEY_N 49
 #define KEY_M 50
 #define KEY_COMMA 51
-#define KEY_DOT 52
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DOT 52
 #define KEY_SLASH 53
 #define KEY_RIGHTSHIFT 54
 #define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFTALT 56
 #define KEY_SPACE 57
 #define KEY_CAPSLOCK 58
 #define KEY_F1 59
-#define KEY_F2 60
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F2 60
 #define KEY_F3 61
 #define KEY_F4 62
 #define KEY_F5 63
-#define KEY_F6 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F6 64
 #define KEY_F7 65
 #define KEY_F8 66
 #define KEY_F9 67
-#define KEY_F10 68
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F10 68
 #define KEY_NUMLOCK 69
 #define KEY_SCROLLLOCK 70
 #define KEY_KP7 71
-#define KEY_KP8 72
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP8 72
 #define KEY_KP9 73
 #define KEY_KPMINUS 74
 #define KEY_KP4 75
-#define KEY_KP5 76
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP5 76
 #define KEY_KP6 77
 #define KEY_KPPLUS 78
 #define KEY_KP1 79
-#define KEY_KP2 80
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP2 80
 #define KEY_KP3 81
 #define KEY_KP0 82
 #define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ZENKAKUHANKAKU 85
 #define KEY_102ND 86
 #define KEY_F11 87
 #define KEY_F12 88
-#define KEY_RO 89
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RO 89
 #define KEY_KATAKANA 90
 #define KEY_HIRAGANA 91
 #define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KATAKANAHIRAGANA 93
 #define KEY_MUHENKAN 94
 #define KEY_KPJPCOMMA 95
 #define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RIGHTCTRL 97
 #define KEY_KPSLASH 98
 #define KEY_SYSRQ 99
 #define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LINEFEED 101
 #define KEY_HOME 102
 #define KEY_UP 103
 #define KEY_PAGEUP 104
-#define KEY_LEFT 105
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFT 105
 #define KEY_RIGHT 106
 #define KEY_END 107
 #define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PAGEDOWN 109
 #define KEY_INSERT 110
 #define KEY_DELETE 111
 #define KEY_MACRO 112
-#define KEY_MUTE 113
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MUTE 113
 #define KEY_VOLUMEDOWN 114
 #define KEY_VOLUMEUP 115
 #define KEY_POWER 116
-#define KEY_KPEQUAL 117
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPEQUAL 117
 #define KEY_KPPLUSMINUS 118
 #define KEY_PAUSE 119
 #define KEY_SCALE 120
-#define KEY_KPCOMMA 121
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPCOMMA 121
 #define KEY_HANGEUL 122
 #define KEY_HANGUEL KEY_HANGEUL
 #define KEY_HANJA 123
-#define KEY_YEN 124
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_YEN 124
 #define KEY_LEFTMETA 125
 #define KEY_RIGHTMETA 126
 #define KEY_COMPOSE 127
-#define KEY_STOP 128
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_STOP 128
 #define KEY_AGAIN 129
 #define KEY_PROPS 130
 #define KEY_UNDO 131
-#define KEY_FRONT 132
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FRONT 132
 #define KEY_COPY 133
 #define KEY_OPEN 134
 #define KEY_PASTE 135
-#define KEY_FIND 136
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FIND 136
 #define KEY_CUT 137
 #define KEY_HELP 138
 #define KEY_MENU 139
-#define KEY_CALC 140
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CALC 140
 #define KEY_SETUP 141
 #define KEY_SLEEP 142
 #define KEY_WAKEUP 143
-#define KEY_FILE 144
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FILE 144
 #define KEY_SENDFILE 145
 #define KEY_DELETEFILE 146
 #define KEY_XFER 147
-#define KEY_PROG1 148
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PROG1 148
 #define KEY_PROG2 149
 #define KEY_WWW 150
 #define KEY_MSDOS 151
-#define KEY_COFFEE 152
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_COFFEE 152
 #define KEY_SCREENLOCK KEY_COFFEE
 #define KEY_DIRECTION 153
 #define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MAIL 155
 #define KEY_BOOKMARKS 156
 #define KEY_COMPUTER 157
 #define KEY_BACK 158
-#define KEY_FORWARD 159
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FORWARD 159
 #define KEY_CLOSECD 160
 #define KEY_EJECTCD 161
 #define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_NEXTSONG 163
 #define KEY_PLAYPAUSE 164
 #define KEY_PREVIOUSSONG 165
 #define KEY_STOPCD 166
-#define KEY_RECORD 167
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RECORD 167
 #define KEY_REWIND 168
 #define KEY_PHONE 169
 #define KEY_ISO 170
-#define KEY_CONFIG 171
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CONFIG 171
 #define KEY_HOMEPAGE 172
 #define KEY_REFRESH 173
 #define KEY_EXIT 174
-#define KEY_MOVE 175
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MOVE 175
 #define KEY_EDIT 176
 #define KEY_SCROLLUP 177
 #define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPLEFTPAREN 179
 #define KEY_KPRIGHTPAREN 180
 #define KEY_NEW 181
 #define KEY_REDO 182
-#define KEY_F13 183
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F13 183
 #define KEY_F14 184
 #define KEY_F15 185
 #define KEY_F16 186
-#define KEY_F17 187
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F17 187
 #define KEY_F18 188
 #define KEY_F19 189
 #define KEY_F20 190
-#define KEY_F21 191
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F21 191
 #define KEY_F22 192
 #define KEY_F23 193
 #define KEY_F24 194
-#define KEY_PLAYCD 200
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PLAYCD 200
 #define KEY_PAUSECD 201
 #define KEY_PROG3 202
 #define KEY_PROG4 203
-#define KEY_DASHBOARD 204
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DASHBOARD 204
 #define KEY_SUSPEND 205
 #define KEY_CLOSE 206
 #define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FASTFORWARD 208
 #define KEY_BASSBOOST 209
 #define KEY_PRINT 210
 #define KEY_HP 211
-#define KEY_CAMERA 212
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CAMERA 212
 #define KEY_SOUND 213
 #define KEY_QUESTION 214
 #define KEY_EMAIL 215
-#define KEY_CHAT 216
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CHAT 216
 #define KEY_SEARCH 217
 #define KEY_CONNECT 218
 #define KEY_FINANCE 219
-#define KEY_SPORT 220
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SPORT 220
 #define KEY_SHOP 221
 #define KEY_ALTERASE 222
 #define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESSDOWN 224
 #define KEY_BRIGHTNESSUP 225
 #define KEY_MEDIA 226
 #define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KBDILLUMTOGGLE 228
 #define KEY_KBDILLUMDOWN 229
 #define KEY_KBDILLUMUP 230
 #define KEY_SEND 231
-#define KEY_REPLY 232
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_REPLY 232
 #define KEY_FORWARDMAIL 233
 #define KEY_SAVE 234
 #define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BATTERY 236
 #define KEY_BLUETOOTH 237
 #define KEY_WLAN 238
 #define KEY_UWB 239
-#define KEY_UNKNOWN 240
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_UNKNOWN 240
 #define KEY_VIDEO_NEXT 241
 #define KEY_VIDEO_PREV 242
 #define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_AUTO 244
+#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF 245
 #define KEY_WWAN 246
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WIMAX KEY_WWAN
 #define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MICMUTE 248
 #define BTN_MISC 0x100
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_0 0x100
 #define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_2 0x102
 #define BTN_3 0x103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_4 0x104
 #define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_6 0x106
 #define BTN_7 0x107
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_8 0x108
 #define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MOUSE 0x110
 #define BTN_LEFT 0x110
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_RIGHT 0x111
 #define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SIDE 0x113
 #define BTN_EXTRA 0x114
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_FORWARD 0x115
 #define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TASK 0x117
 #define BTN_JOYSTICK 0x120
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER 0x120
 #define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMB2 0x122
 #define BTN_TOP 0x123
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOP2 0x124
 #define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE 0x126
 #define BTN_BASE2 0x127
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE3 0x128
 #define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE5 0x12a
 #define BTN_BASE6 0x12b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DEAD 0x12f
 #define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SOUTH 0x130
 #define BTN_A BTN_SOUTH
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_EAST 0x131
 #define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_C 0x132
 #define BTN_NORTH 0x133
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_X BTN_NORTH
 #define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_Y BTN_WEST
 #define BTN_Z 0x135
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL 0x136
 #define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL2 0x138
 #define BTN_TR2 0x139
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SELECT 0x13a
 #define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MODE 0x13c
 #define BTN_THUMBL 0x13d
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMBR 0x13e
 #define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_PEN 0x140
 #define BTN_TOOL_RUBBER 0x141
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_BRUSH 0x142
 #define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_AIRBRUSH 0x144
 #define BTN_TOOL_FINGER 0x145
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_MOUSE 0x146
 #define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUINTTAP 0x148
 #define BTN_TOUCH 0x14a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_STYLUS 0x14b
 #define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_DOUBLETAP 0x14d
 #define BTN_TOOL_TRIPLETAP 0x14e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUADTAP 0x14f
 #define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_GEAR_DOWN 0x150
 #define BTN_GEAR_UP 0x151
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_OK 0x160
 #define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GOTO 0x162
 #define KEY_CLEAR 0x163
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_POWER2 0x164
 #define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_INFO 0x166
 #define KEY_TIME 0x167
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VENDOR 0x168
 #define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PROGRAM 0x16a
 #define KEY_CHANNEL 0x16b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FAVORITES 0x16c
 #define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PVR 0x16e
 #define KEY_MHP 0x16f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_LANGUAGE 0x170
 #define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SUBTITLE 0x172
 #define KEY_ANGLE 0x173
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOM 0x174
 #define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_KEYBOARD 0x176
 #define KEY_SCREEN 0x177
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PC 0x178
 #define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TV2 0x17a
 #define KEY_VCR 0x17b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VCR2 0x17c
 #define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SAT2 0x17e
 #define KEY_CD 0x17f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TAPE 0x180
 #define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TUNER 0x182
 #define KEY_PLAYER 0x183
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEXT 0x184
 #define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUX 0x186
 #define KEY_MP3 0x187
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUDIO 0x188
 #define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DIRECTORY 0x18a
 #define KEY_LIST 0x18b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEMO 0x18c
 #define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RED 0x18e
 #define KEY_GREEN 0x18f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_YELLOW 0x190
 #define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CHANNELUP 0x192
 #define KEY_CHANNELDOWN 0x193
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FIRST 0x194
 #define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AB 0x196
 #define KEY_NEXT 0x197
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RESTART 0x198
 #define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SHUFFLE 0x19a
 #define KEY_BREAK 0x19b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PREVIOUS 0x19c
 #define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEEN 0x19e
 #define KEY_TWEN 0x19f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VIDEOPHONE 0x1a0
 #define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMIN 0x1a2
 #define KEY_ZOOMOUT 0x1a3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMRESET 0x1a4
 #define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EDITOR 0x1a6
 #define KEY_SPREADSHEET 0x1a7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GRAPHICSEDITOR 0x1a8
 #define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DATABASE 0x1aa
 #define KEY_NEWS 0x1ab
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VOICEMAIL 0x1ac
 #define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MESSENGER 0x1ae
 #define KEY_DISPLAYTOGGLE 0x1af
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK 0x1b0
 #define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DOLLAR 0x1b2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EURO 0x1b3
 #define KEY_FRAMEBACK 0x1b4
 #define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CONTEXT_MENU 0x1b6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEDIA_REPEAT 0x1b7
 #define KEY_10CHANNELSUP 0x1b8
 #define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_IMAGES 0x1ba
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_EOL 0x1c0
 #define KEY_DEL_EOS 0x1c1
 #define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_LINE 0x1c3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN 0x1d0
 #define KEY_FN_ESC 0x1d1
 #define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F2 0x1d3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F3 0x1d4
 #define KEY_FN_F4 0x1d5
 #define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F6 0x1d7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F7 0x1d8
 #define KEY_FN_F8 0x1d9
 #define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F10 0x1db
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F11 0x1dc
 #define KEY_FN_F12 0x1dd
 #define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_2 0x1df
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_D 0x1e0
 #define KEY_FN_E 0x1e1
 #define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_S 0x1e3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_B 0x1e4
 #define KEY_BRL_DOT1 0x1f1
 #define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT3 0x1f3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT4 0x1f4
 #define KEY_BRL_DOT5 0x1f5
 #define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT7 0x1f7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT8 0x1f8
 #define KEY_BRL_DOT9 0x1f9
 #define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_0 0x200
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_1 0x201
 #define KEY_NUMERIC_2 0x202
 #define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_4 0x204
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_5 0x205
 #define KEY_NUMERIC_6 0x206
 #define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_8 0x208
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_9 0x209
 #define KEY_NUMERIC_STAR 0x20a
 #define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_FOCUS 0x210
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WPS_BUTTON 0x211
 #define KEY_TOUCHPAD_TOGGLE 0x212
 #define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TOUCHPAD_OFF 0x214
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_ZOOMIN 0x215
 #define KEY_CAMERA_ZOOMOUT 0x216
 #define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_DOWN 0x218
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_LEFT 0x219
 #define KEY_CAMERA_RIGHT 0x21a
 #define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_OFF 0x21c
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_TOGGLE 0x21d
 #define KEY_LIGHTS_TOGGLE 0x21e
 #define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_DOWN 0x221
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_LEFT 0x222
 #define BTN_DPAD_RIGHT 0x223
 #define KEY_ALS_TOGGLE 0x230
+#define KEY_BUTTONCONFIG 0x240
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_TASKMANAGER 0x241
+#define KEY_JOURNAL 0x242
+#define KEY_CONTROLPANEL 0x243
+#define KEY_APPSELECT 0x244
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SCREENSAVER 0x245
+#define KEY_VOICECOMMAND 0x246
+#define KEY_BRIGHTNESS_MIN 0x250
+#define KEY_BRIGHTNESS_MAX 0x251
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER_HAPPY 0x2c0
 #define BTN_TRIGGER_HAPPY1 0x2c0
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ion.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ion.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ion.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ion.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ioprio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ioprio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ip.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ip6_tunnel.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ip6_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ip_vs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ip_vs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipmi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipmi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipmi_msgdefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipmi_msgdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipsec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipsec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipv6_route.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipv6_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ipx.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ipx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irda.h b/9/platforms/android-21/arch-arm64/usr/include/linux/irda.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/irda.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/irda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h b/9/platforms/android-21/arch-arm64/usr/include/linux/irqnr.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/irqnr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h b/9/platforms/android-21/arch-arm64/usr/include/linux/isdn.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/isdn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/isdn/capicmd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/isdn/capicmd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h b/9/platforms/android-21/arch-arm64/usr/include/linux/isdn_divertif.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/isdn_divertif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/isdn_ppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/isdn_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h b/9/platforms/android-21/arch-arm64/usr/include/linux/isdnif.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/isdnif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/iso_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/iso_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ivtv.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ivtv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ivtvfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ivtvfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ixjuser.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ixjuser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h b/9/platforms/android-21/arch-arm64/usr/include/linux/jffs2.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/jffs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h b/9/platforms/android-21/arch-arm64/usr/include/linux/joystick.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/joystick.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kdev_t.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kdev_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kernel-page-flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kernel-page-flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kernel.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kernel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kernelcapi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kernelcapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kexec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kexec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h b/9/platforms/android-21/arch-arm64/usr/include/linux/keyboard.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/keyboard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h b/9/platforms/android-21/arch-arm64/usr/include/linux/keychord.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/keychord.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/keyctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/keyctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kvm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kvm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h b/9/platforms/android-21/arch-arm64/usr/include/linux/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/l2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/libc-compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/libc-compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/limits.h b/9/platforms/android-21/arch-arm64/usr/include/linux/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/limits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/llc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/llc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/llc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/llc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/loop.h b/9/platforms/android-21/arch-arm64/usr/include/linux/loop.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/loop.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/loop.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/lp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/lp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/lp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/lp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/magic.h b/9/platforms/android-21/arch-arm64/usr/include/linux/magic.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/magic.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/magic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/major.h b/9/platforms/android-21/arch-arm64/usr/include/linux/major.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/major.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/major.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h b/9/platforms/android-21/arch-arm64/usr/include/linux/map_to_7segment.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/map_to_7segment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/matroxfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/matroxfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mdio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/media.h b/9/platforms/android-21/arch-arm64/usr/include/linux/media.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/media.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/media.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mei.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mei.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mei.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mei.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mempolicy.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mempolicy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/meye.h b/9/platforms/android-21/arch-arm64/usr/include/linux/meye.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/meye.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/meye.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mic_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mic_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mic_ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mic_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mii.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mii.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mii.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mii.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/minix_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/minix_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mman.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mman.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mmc/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mmc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mmtimer.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mmtimer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/module.h b/9/platforms/android-21/arch-arm64/usr/include/linux/module.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/module.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/module.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mqueue.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mroute.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mroute.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mroute6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mroute6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/msdos_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/msdos_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/msg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/msg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/mtio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/mtio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h b/9/platforms/android-21/arch-arm64/usr/include/linux/n_r3964.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/n_r3964.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nbd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nbd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ncp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ncp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ncp_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ncp_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ncp_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ncp_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ncp_no.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ncp_no.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h b/9/platforms/android-21/arch-arm64/usr/include/linux/neighbour.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/neighbour.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net.h b/9/platforms/android-21/arch-arm64/usr/include/linux/net.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/net.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h b/9/platforms/android-21/arch-arm64/usr/include/linux/net_dropmon.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/net_dropmon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/net_tstamp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/net_tstamp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netdevice.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netdevice.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/x_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/x_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CT.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_CT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_LED.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_LED.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_MARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_MARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TEE.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TEE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_bpf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_bpf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_cluster.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_cluster.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_comment.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_comment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connmark.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_connmark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_cpu.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_cpu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_dccp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_dscp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_dscp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_ecn.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_esp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_esp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_helper.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_helper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_iprange.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_iprange.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_length.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_length.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_limit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_mac.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_mac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_mark.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_mark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_multiport.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_multiport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_osf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_osf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_owner.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_owner.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_physdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_physdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_policy.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_policy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_quota.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_rateest.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_rateest.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_realm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_realm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_recent.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_recent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_set.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_state.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_state.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_statistic.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_statistic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_string.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_time.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_u32.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter/xt_u32.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_decnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_decnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netlink_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netlink_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h b/9/platforms/android-21/arch-arm64/usr/include/linux/netrom.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/netrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs2.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs3.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs4.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs4_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs4_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs_idmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs_idmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfs_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfsacl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfsacl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/cld.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/cld.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/debug.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/export.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/export.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/nfsfh.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/nfsfh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/stats.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nfsd/stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nl80211.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nl80211.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nubus.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nubus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nvme.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nvme.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h b/9/platforms/android-21/arch-arm64/usr/include/linux/nvram.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/nvram.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/omap3isp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/omap3isp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/omapfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/omapfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/oom.h b/9/platforms/android-21/arch-arm64/usr/include/linux/oom.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/oom.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/oom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h b/9/platforms/android-21/arch-arm64/usr/include/linux/openvswitch.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/openvswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h b/9/platforms/android-21/arch-arm64/usr/include/linux/packet_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/packet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/param.h b/9/platforms/android-21/arch-arm64/usr/include/linux/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/param.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/parport.h b/9/platforms/android-21/arch-arm64/usr/include/linux/parport.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/parport.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/parport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h b/9/platforms/android-21/arch-arm64/usr/include/linux/patchkey.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/patchkey.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pci.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pci.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pci_regs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pci_regs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h b/9/platforms/android-21/arch-arm64/usr/include/linux/perf_event.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/perf_event.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/personality.h b/9/platforms/android-21/arch-arm64/usr/include/linux/personality.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/personality.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pfkeyv2.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pfkeyv2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h b/9/platforms/android-21/arch-arm64/usr/include/linux/phantom.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/phantom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/phonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pkt_cls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pkt_cls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pkt_sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pkt_sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pktcdvd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pktcdvd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pmu.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pmu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/poll.h b/9/platforms/android-21/arch-arm64/usr/include/linux/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/poll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h b/9/platforms/android-21/arch-arm64/usr/include/linux/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ppdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ppdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ppp-comp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ppp-comp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ppp-ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ppp-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ppp_defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ppp_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pps.h b/9/platforms/android-21/arch-arm64/usr/include/linux/pps.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/pps.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/pps.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ptp_clock.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ptp_clock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/qnx4_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/qnx4_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h b/9/platforms/android-21/arch-arm64/usr/include/linux/qnxtypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/qnxtypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/quota.h b/9/platforms/android-21/arch-arm64/usr/include/linux/quota.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/quota.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h b/9/platforms/android-21/arch-arm64/usr/include/linux/radeonfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/radeonfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h b/9/platforms/android-21/arch-arm64/usr/include/linux/raid/md_p.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/raid/md_p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h b/9/platforms/android-21/arch-arm64/usr/include/linux/raid/md_u.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/raid/md_u.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/random.h b/9/platforms/android-21/arch-arm64/usr/include/linux/random.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/random.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/random.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raw.h b/9/platforms/android-21/arch-arm64/usr/include/linux/raw.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/raw.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rds.h b/9/platforms/android-21/arch-arm64/usr/include/linux/rds.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/rds.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/rds.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h b/9/platforms/android-21/arch-arm64/usr/include/linux/reboot.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/reiserfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/reiserfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h b/9/platforms/android-21/arch-arm64/usr/include/linux/reiserfs_xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/reiserfs_xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/resource.h b/9/platforms/android-21/arch-arm64/usr/include/linux/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/resource.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h b/9/platforms/android-21/arch-arm64/usr/include/linux/rfkill.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/rfkill.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/romfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/romfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rose.h b/9/platforms/android-21/arch-arm64/usr/include/linux/rose.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/rose.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/rose.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/route.h b/9/platforms/android-21/arch-arm64/usr/include/linux/route.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/route.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/rtc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/rtc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/rtnetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/rtnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/scc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/scc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/scc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/scc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sched.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sched.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h b/9/platforms/android-21/arch-arm64/usr/include/linux/screen_info.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/screen_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sdla.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sdla.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/seccomp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/seccomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h b/9/platforms/android-21/arch-arm64/usr/include/linux/securebits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/securebits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/selinux_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/selinux_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sem.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sem.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sem.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial.h b/9/platforms/android-21/arch-arm64/usr/include/linux/serial.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/serial.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/serial.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h b/9/platforms/android-21/arch-arm64/usr/include/linux/serial_core.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/serial_core.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h b/9/platforms/android-21/arch-arm64/usr/include/linux/serial_reg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/serial_reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/serio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/serio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/serio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/shm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/shm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/shm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signal.h b/9/platforms/android-21/arch-arm64/usr/include/linux/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/signal.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/signalfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/snmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/snmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sock_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sock_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/socket.h b/9/platforms/android-21/arch-arm64/usr/include/linux/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/socket.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/som.h b/9/platforms/android-21/arch-arm64/usr/include/linux/som.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/som.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/som.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sonypi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sonypi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sound.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sound.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sound.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h b/9/platforms/android-21/arch-arm64/usr/include/linux/soundcard.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/soundcard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/spi/spidev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/spi/spidev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/stat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h b/9/platforms/android-21/arch-arm64/usr/include/linux/stddef.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/stddef.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/string.h b/9/platforms/android-21/arch-arm64/usr/include/linux/string.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/string.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sunrpc/debug.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sunrpc/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h b/9/platforms/android-21/arch-arm64/usr/include/linux/suspend_ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/suspend_ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sw_sync.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sw_sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/swab.h b/9/platforms/android-21/arch-arm64/usr/include/linux/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/swab.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sync.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sync.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sync.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h b/9/platforms/android-21/arch-arm64/usr/include/linux/synclink.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/synclink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sysctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sysctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h b/9/platforms/android-21/arch-arm64/usr/include/linux/sysinfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h b/9/platforms/android-21/arch-arm64/usr/include/linux/taskstats.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/taskstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_csum.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_csum.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_defact.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_defact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_gact.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_gact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_ipt.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_ipt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_mirred.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_mirred.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_pedit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_pedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tcp_metrics.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tcp_metrics.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h b/9/platforms/android-21/arch-arm64/usr/include/linux/telephony.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/telephony.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/termios.h b/9/platforms/android-21/arch-arm64/usr/include/linux/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/termios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/time.h b/9/platforms/android-21/arch-arm64/usr/include/linux/time.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/time.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/times.h b/9/platforms/android-21/arch-arm64/usr/include/linux/times.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/times.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/timex.h b/9/platforms/android-21/arch-arm64/usr/include/linux/timex.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/timex.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tiocl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tiocl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tipc_config.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tipc_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h b/9/platforms/android-21/arch-arm64/usr/include/linux/toshiba.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/toshiba.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tty.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tty.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h b/9/platforms/android-21/arch-arm64/usr/include/linux/tty_flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/tty_flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/types.h b/9/platforms/android-21/arch-arm64/usr/include/linux/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h b/9/platforms/android-21/arch-arm64/usr/include/linux/udf_fs_i.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/udf_fs_i.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/udp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/udp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h b/9/platforms/android-21/arch-arm64/usr/include/linux/uhid.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/uhid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h b/9/platforms/android-21/arch-arm64/usr/include/linux/uinput.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/uinput.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/uio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/uio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h b/9/platforms/android-21/arch-arm64/usr/include/linux/ultrasound.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/ultrasound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/un.h b/9/platforms/android-21/arch-arm64/usr/include/linux/un.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/un.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h b/9/platforms/android-21/arch-arm64/usr/include/linux/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h b/9/platforms/android-21/arch-arm64/usr/include/linux/unix_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/unix_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/audio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/cdc-wdm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/cdc-wdm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/cdc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/cdc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/ch11.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/ch11.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/ch9.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/ch9.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/f_accessory.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/f_accessory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/f_mtp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/f_mtp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/functionfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/functionfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/g_printer.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/g_printer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/gadgetfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/gadgetfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/midi.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/midi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/tmc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/tmc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usb/video.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h b/9/platforms/android-21/arch-arm64/usr/include/linux/usbdevice_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/usbdevice_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utime.h b/9/platforms/android-21/arch-arm64/usr/include/linux/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/utime.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h b/9/platforms/android-21/arch-arm64/usr/include/linux/utsname.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h b/9/platforms/android-21/arch-arm64/usr/include/linux/uuid.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/uuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h b/9/platforms/android-21/arch-arm64/usr/include/linux/uvcvideo.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/uvcvideo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h b/9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-common.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h b/9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-controls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-controls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h b/9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-dv-timings.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-dv-timings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h b/9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-mediabus.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-mediabus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h b/9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-subdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/v4l2-subdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/version.h b/9/platforms/android-21/arch-arm64/usr/include/linux/version.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/version.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/veth.h b/9/platforms/android-21/arch-arm64/usr/include/linux/veth.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/veth.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/veth.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h b/9/platforms/android-21/arch-arm64/usr/include/linux/vfio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/vfio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h b/9/platforms/android-21/arch-arm64/usr/include/linux/vhost.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/vhost.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h b/9/platforms/android-21/arch-arm64/usr/include/linux/videodev2.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/videodev2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_9p.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_9p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_balloon.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_balloon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_blk.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_blk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_config.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_console.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_console.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_ids.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_net.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_pci.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_ring.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_ring.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h b/9/platforms/android-21/arch-arm64/usr/include/linux/virtio_rng.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/virtio_rng.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h b/9/platforms/android-21/arch-arm64/usr/include/linux/vm_sockets.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/vm_sockets.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h b/9/platforms/android-21/arch-arm64/usr/include/linux/vsp1.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/vsp1.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vt.h b/9/platforms/android-21/arch-arm64/usr/include/linux/vt.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/vt.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wait.h b/9/platforms/android-21/arch-arm64/usr/include/linux/wait.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/wait.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h b/9/platforms/android-21/arch-arm64/usr/include/linux/wanrouter.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/wanrouter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h b/9/platforms/android-21/arch-arm64/usr/include/linux/watchdog.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/watchdog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h b/9/platforms/android-21/arch-arm64/usr/include/linux/wimax.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/wimax.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h b/9/platforms/android-21/arch-arm64/usr/include/linux/wimax/i2400m.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/wimax/i2400m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h b/9/platforms/android-21/arch-arm64/usr/include/linux/wireless.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/wireless.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/x25.h b/9/platforms/android-21/arch-arm64/usr/include/linux/x25.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/x25.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h b/9/platforms/android-21/arch-arm64/usr/include/linux/xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h b/9/platforms/android-21/arch-arm64/usr/include/linux/xfrm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/xfrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h b/9/platforms/android-21/arch-arm64/usr/include/linux/zorro.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/zorro.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h b/9/platforms/android-21/arch-arm64/usr/include/linux/zorro_ids.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h
rename to 9/platforms/android-21/arch-arm64/usr/include/linux/zorro_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/locale.h b/9/platforms/android-21/arch-arm64/usr/include/locale.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/locale.h
rename to 9/platforms/android-21/arch-arm64/usr/include/locale.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/asm.h b/9/platforms/android-21/arch-arm64/usr/include/machine/asm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/asm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/asm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/elf_machdep.h b/9/platforms/android-21/arch-arm64/usr/include/machine/elf_machdep.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/elf_machdep.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/elf_machdep.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/endian.h b/9/platforms/android-21/arch-arm64/usr/include/machine/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/endian.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/exec.h b/9/platforms/android-21/arch-arm64/usr/include/machine/exec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/exec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/exec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/fenv.h b/9/platforms/android-21/arch-arm64/usr/include/machine/fenv.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/fenv.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/fenv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h b/9/platforms/android-21/arch-arm64/usr/include/machine/ieee.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/ieee.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/setjmp.h b/9/platforms/android-21/arch-arm64/usr/include/machine/setjmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/setjmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/setjmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h b/9/platforms/android-21/arch-arm64/usr/include/machine/wchar_limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/machine/wchar_limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/malloc.h b/9/platforms/android-21/arch-arm64/usr/include/malloc.h
similarity index 85%
copy from 9/platforms/android-19/arch-arm64/usr/include/malloc.h
copy to 9/platforms/android-21/arch-arm64/usr/include/malloc.h
index 1e92b7d..e6ea276 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/malloc.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/malloc.h
@@ -27,19 +27,12 @@
 
 __BEGIN_DECLS
 
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
 extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
 extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
 extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
 extern void free(void* p);
+
+extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
 #ifndef STRUCT_MALLINFO_DECLARED
diff --git a/9/platforms/android-19/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-arm64/usr/include/math.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/math.h
copy to 9/platforms/android-21/arch-arm64/usr/include/math.h
index 8369d6e..e872388 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/math.h
@@ -512,7 +512,8 @@
 double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
 double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
 int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
+/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
 int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaCodec.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaCodec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaCrypto.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaCrypto.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaDrm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaDrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaError.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaError.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaExtractor.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaExtractor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaFormat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaFormat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h b/9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaMuxer.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h
rename to 9/platforms/android-21/arch-arm64/usr/include/media/NdkMediaMuxer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/memory.h b/9/platforms/android-21/arch-arm64/usr/include/memory.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/memory.h
rename to 9/platforms/android-21/arch-arm64/usr/include/memory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/mntent.h b/9/platforms/android-21/arch-arm64/usr/include/mntent.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/mntent.h
rename to 9/platforms/android-21/arch-arm64/usr/include/mntent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h b/9/platforms/android-21/arch-arm64/usr/include/net/ethernet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/ethernet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h b/9/platforms/android-21/arch-arm64/usr/include/net/ethertypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/ethertypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if.h b/9/platforms/android-21/arch-arm64/usr/include/net/if.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/if.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h b/9/platforms/android-21/arch-arm64/usr/include/net/if_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h b/9/platforms/android-21/arch-arm64/usr/include/net/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h b/9/platforms/android-21/arch-arm64/usr/include/net/if_ieee1394.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/if_ieee1394.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h b/9/platforms/android-21/arch-arm64/usr/include/net/if_packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_types.h b/9/platforms/android-21/arch-arm64/usr/include/net/if_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/if_types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/if_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/route.h b/9/platforms/android-21/arch-arm64/usr/include/net/route.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/net/route.h
rename to 9/platforms/android-21/arch-arm64/usr/include/net/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netdb.h b/9/platforms/android-21/arch-arm64/usr/include/netdb.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netdb.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netdb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/icmp6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/icmp6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/in.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/in.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/in6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/in_systm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/in_systm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/ip6.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/ip_icmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/ip_icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h b/9/platforms/android-21/arch-arm64/usr/include/netinet/udp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netinet/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h b/9/platforms/android-21/arch-arm64/usr/include/netpacket/packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h
rename to 9/platforms/android-21/arch-arm64/usr/include/netpacket/packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h b/9/platforms/android-21/arch-arm64/usr/include/nsswitch.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
rename to 9/platforms/android-21/arch-arm64/usr/include/nsswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pathconf.h b/9/platforms/android-21/arch-arm64/usr/include/pathconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/pathconf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/pathconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/paths.h b/9/platforms/android-21/arch-arm64/usr/include/paths.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/paths.h
rename to 9/platforms/android-21/arch-arm64/usr/include/paths.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/poll.h b/9/platforms/android-21/arch-arm64/usr/include/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/poll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pthread.h b/9/platforms/android-21/arch-arm64/usr/include/pthread.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/pthread.h
rename to 9/platforms/android-21/arch-arm64/usr/include/pthread.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pwd.h b/9/platforms/android-21/arch-arm64/usr/include/pwd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/pwd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/pwd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/regex.h b/9/platforms/android-21/arch-arm64/usr/include/regex.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/regex.h
rename to 9/platforms/android-21/arch-arm64/usr/include/regex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/resolv.h b/9/platforms/android-21/arch-arm64/usr/include/resolv.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/resolv.h
rename to 9/platforms/android-21/arch-arm64/usr/include/resolv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sched.h b/9/platforms/android-21/arch-arm64/usr/include/sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sched.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/search.h b/9/platforms/android-21/arch-arm64/usr/include/search.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/search.h
rename to 9/platforms/android-21/arch-arm64/usr/include/search.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/semaphore.h b/9/platforms/android-21/arch-arm64/usr/include/semaphore.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/semaphore.h
rename to 9/platforms/android-21/arch-arm64/usr/include/semaphore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/setjmp.h b/9/platforms/android-21/arch-arm64/usr/include/setjmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/setjmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/setjmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgidefs.h b/9/platforms/android-21/arch-arm64/usr/include/sgidefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sgidefs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sgidefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgtty.h b/9/platforms/android-21/arch-arm64/usr/include/sgtty.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sgtty.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sgtty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/signal.h b/9/platforms/android-21/arch-arm64/usr/include/signal.h
similarity index 98%
copy from 9/platforms/android-19/arch-arm64/usr/include/signal.h
copy to 9/platforms/android-21/arch-arm64/usr/include/signal.h
index f1849c5..e23e65b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/signal.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
copy to 9/platforms/android-21/arch-arm64/usr/include/stdatomic.h
index 3db25a7..58cb1bc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
@@ -89,6 +89,7 @@
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_consume;
+using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdint.h b/9/platforms/android-21/arch-arm64/usr/include/stdint.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/stdint.h
rename to 9/platforms/android-21/arch-arm64/usr/include/stdint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdio.h b/9/platforms/android-21/arch-arm64/usr/include/stdio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/stdio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/stdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-21/arch-arm64/usr/include/stdlib.h
similarity index 96%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdlib.h
copy to 9/platforms/android-21/arch-arm64/usr/include/stdlib.h
index a0f017c..e04475c 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/stdlib.h
@@ -76,8 +76,8 @@
 extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
 
 extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
+extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
+extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
 
 extern int atoi(const char*) __purefunc;
 extern long atol(const char*) __purefunc;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/string.h b/9/platforms/android-21/arch-arm64/usr/include/string.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/string.h
rename to 9/platforms/android-21/arch-arm64/usr/include/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/strings.h b/9/platforms/android-21/arch-arm64/usr/include/strings.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/strings.h
rename to 9/platforms/android-21/arch-arm64/usr/include/strings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h b/9/platforms/android-21/arch-arm64/usr/include/sys/auxv.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/auxv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h b/9/platforms/android-21/arch-arm64/usr/include/sys/cachectl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/cachectl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/capability.h b/9/platforms/android-21/arch-arm64/usr/include/sys/capability.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/capability.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h b/9/platforms/android-21/arch-arm64/usr/include/sys/cdefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/cdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h b/9/platforms/android-21/arch-arm64/usr/include/sys/cdefs_elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/cdefs_elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h b/9/platforms/android-21/arch-arm64/usr/include/sys/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h b/9/platforms/android-21/arch-arm64/usr/include/sys/epoll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/epoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/errno.h b/9/platforms/android-21/arch-arm64/usr/include/sys/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/errno.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h b/9/platforms/android-21/arch-arm64/usr/include/sys/eventfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/eventfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/file.h b/9/platforms/android-21/arch-arm64/usr/include/sys/file.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/file.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/file.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h b/9/platforms/android-21/arch-arm64/usr/include/sys/fsuid.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/fsuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h b/9/platforms/android-21/arch-arm64/usr/include/sys/glibc-syscalls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/glibc-syscalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h b/9/platforms/android-21/arch-arm64/usr/include/sys/inotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ioctl_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ioctl_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/klog.h b/9/platforms/android-21/arch-arm64/usr/include/sys/klog.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/klog.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/klog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/limits.h b/9/platforms/android-21/arch-arm64/usr/include/sys/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/limits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mman.h b/9/platforms/android-21/arch-arm64/usr/include/sys/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/mman.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mount.h b/9/platforms/android-21/arch-arm64/usr/include/sys/mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/mount.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/msg.h b/9/platforms/android-21/arch-arm64/usr/include/sys/msg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/msg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/param.h b/9/platforms/android-21/arch-arm64/usr/include/sys/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/param.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/personality.h b/9/platforms/android-21/arch-arm64/usr/include/sys/personality.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/personality.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/poll.h b/9/platforms/android-21/arch-arm64/usr/include/sys/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/poll.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h b/9/platforms/android-21/arch-arm64/usr/include/sys/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/queue.h b/9/platforms/android-21/arch-arm64/usr/include/sys/queue.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/queue.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h b/9/platforms/android-21/arch-arm64/usr/include/sys/reboot.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reg.h b/9/platforms/android-21/arch-arm64/usr/include/sys/reg.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/reg.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/resource.h b/9/platforms/android-21/arch-arm64/usr/include/sys/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/resource.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/select.h b/9/platforms/android-21/arch-arm64/usr/include/sys/select.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/select.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/select.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sem.h b/9/platforms/android-21/arch-arm64/usr/include/sys/sem.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/sem.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h b/9/platforms/android-21/arch-arm64/usr/include/sys/sendfile.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/sendfile.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/shm.h b/9/platforms/android-21/arch-arm64/usr/include/sys/shm.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/shm.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signal.h b/9/platforms/android-21/arch-arm64/usr/include/sys/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/signal.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h b/9/platforms/android-21/arch-arm64/usr/include/sys/signalfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socket.h b/9/platforms/android-21/arch-arm64/usr/include/sys/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/socket.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h b/9/platforms/android-21/arch-arm64/usr/include/sys/socketcalls.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/socketcalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h b/9/platforms/android-21/arch-arm64/usr/include/sys/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h b/9/platforms/android-21/arch-arm64/usr/include/sys/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h b/9/platforms/android-21/arch-arm64/usr/include/sys/statvfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/statvfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/swap.h b/9/platforms/android-21/arch-arm64/usr/include/sys/swap.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/swap.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/swap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h b/9/platforms/android-21/arch-arm64/usr/include/sys/syscall.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/syscall.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h b/9/platforms/android-21/arch-arm64/usr/include/sys/sysconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/sysconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h b/9/platforms/android-21/arch-arm64/usr/include/sys/sysinfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h b/9/platforms/android-21/arch-arm64/usr/include/sys/syslimits.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/syslimits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h b/9/platforms/android-21/arch-arm64/usr/include/sys/sysmacros.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/sysmacros.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h b/9/platforms/android-21/arch-arm64/usr/include/sys/system_properties.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/system_properties.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/time.h b/9/platforms/android-21/arch-arm64/usr/include/sys/time.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/time.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h b/9/platforms/android-21/arch-arm64/usr/include/sys/timerfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/timerfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/times.h b/9/platforms/android-21/arch-arm64/usr/include/sys/times.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/times.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timex.h b/9/platforms/android-21/arch-arm64/usr/include/sys/timex.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/timex.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ttychars.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ttychars.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ttydefaults.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ttydefaults.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ttydev.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ttydev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/types.h b/9/platforms/android-21/arch-arm64/usr/include/sys/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/types.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-arm64/usr/include/sys/ucontext.h
similarity index 96%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/ucontext.h
index f62380d..dd2a0bb 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -80,6 +78,10 @@
 
 #elif defined(__aarch64__)
 
+#define NGREG 34 /* x0..x30 + sp + pc + pstate */
+typedef unsigned long greg_t;
+typedef greg_t gregset_t[NGREG];
+
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -152,11 +154,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/uio.h b/9/platforms/android-21/arch-arm64/usr/include/sys/uio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/uio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/un.h b/9/platforms/android-21/arch-arm64/usr/include/sys/un.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/un.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/user.h b/9/platforms/android-21/arch-arm64/usr/include/sys/user.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/user.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/user.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utime.h b/9/platforms/android-21/arch-arm64/usr/include/sys/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/utime.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h b/9/platforms/android-21/arch-arm64/usr/include/sys/utsname.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h b/9/platforms/android-21/arch-arm64/usr/include/sys/vfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/vfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vt.h b/9/platforms/android-21/arch-arm64/usr/include/sys/vt.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/vt.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/wait.h b/9/platforms/android-21/arch-arm64/usr/include/sys/wait.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/wait.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h b/9/platforms/android-21/arch-arm64/usr/include/sys/xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h
rename to 9/platforms/android-21/arch-arm64/usr/include/sys/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/syslog.h b/9/platforms/android-21/arch-arm64/usr/include/syslog.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/syslog.h
rename to 9/platforms/android-21/arch-arm64/usr/include/syslog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termio.h b/9/platforms/android-21/arch-arm64/usr/include/termio.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/termio.h
rename to 9/platforms/android-21/arch-arm64/usr/include/termio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termios.h b/9/platforms/android-21/arch-arm64/usr/include/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/termios.h
rename to 9/platforms/android-21/arch-arm64/usr/include/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/thread_db.h b/9/platforms/android-21/arch-arm64/usr/include/thread_db.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/thread_db.h
rename to 9/platforms/android-21/arch-arm64/usr/include/thread_db.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time.h b/9/platforms/android-21/arch-arm64/usr/include/time.h
similarity index 91%
copy from 9/platforms/android-19/arch-arm64/usr/include/time.h
copy to 9/platforms/android-21/arch-arm64/usr/include/time.h
index 0a5f18b..aa72fcc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/time.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/time.h
@@ -85,8 +85,10 @@
 
 extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
 
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__;
 
 extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
 extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time64.h b/9/platforms/android-21/arch-arm64/usr/include/time64.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/time64.h
rename to 9/platforms/android-21/arch-arm64/usr/include/time64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/uchar.h b/9/platforms/android-21/arch-arm64/usr/include/uchar.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/uchar.h
rename to 9/platforms/android-21/arch-arm64/usr/include/uchar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ucontext.h b/9/platforms/android-21/arch-arm64/usr/include/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/ucontext.h
rename to 9/platforms/android-21/arch-arm64/usr/include/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/unistd.h b/9/platforms/android-21/arch-arm64/usr/include/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/unistd.h
rename to 9/platforms/android-21/arch-arm64/usr/include/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/util.h b/9/platforms/android-21/arch-arm64/usr/include/util.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/util.h
rename to 9/platforms/android-21/arch-arm64/usr/include/util.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utime.h b/9/platforms/android-21/arch-arm64/usr/include/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/utime.h
rename to 9/platforms/android-21/arch-arm64/usr/include/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utmp.h b/9/platforms/android-21/arch-arm64/usr/include/utmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/utmp.h
rename to 9/platforms/android-21/arch-arm64/usr/include/utmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-21/arch-arm64/usr/include/wchar.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/wchar.h
copy to 9/platforms/android-21/arch-arm64/usr/include/wchar.h
index f421d4c..cfa9b74 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-21/arch-arm64/usr/include/wchar.h
@@ -151,8 +151,8 @@
 extern int               wprintf(const wchar_t *, ...);
 extern int               wscanf(const wchar_t *, ...);
 
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
+extern long long          wcstoll_l(const wchar_t *, wchar_t **, int, locale_t);
+extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t);
 extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
 
 extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wctype.h b/9/platforms/android-21/arch-arm64/usr/include/wctype.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/wctype.h
rename to 9/platforms/android-21/arch-arm64/usr/include/wctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/xlocale.h b/9/platforms/android-21/arch-arm64/usr/include/xlocale.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/xlocale.h
rename to 9/platforms/android-21/arch-arm64/usr/include/xlocale.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zconf.h b/9/platforms/android-21/arch-arm64/usr/include/zconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/zconf.h
rename to 9/platforms/android-21/arch-arm64/usr/include/zconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zlib.h b/9/platforms/android-21/arch-arm64/usr/include/zlib.h
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/include/zlib.h
rename to 9/platforms/android-21/arch-arm64/usr/include/zlib.h
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_dynamic.o b/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_dynamic.o
new file mode 100644
index 0000000..8e1aa71
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_so.o b/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_so.o
new file mode 100644
index 0000000..75d561c
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_static.o b/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_static.o
new file mode 100644
index 0000000..8e1aa71
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/crtend_android.o b/9/platforms/android-21/arch-arm64/usr/lib/crtend_android.o
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/lib/crtend_android.o
rename to 9/platforms/android-21/arch-arm64/usr/lib/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/crtend_so.o b/9/platforms/android-21/arch-arm64/usr/lib/crtend_so.o
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/lib/crtend_so.o
rename to 9/platforms/android-21/arch-arm64/usr/lib/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libEGL.so b/9/platforms/android-21/arch-arm64/usr/lib/libEGL.so
similarity index 69%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libEGL.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libEGL.so
index 85ea172..a037b1c 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libEGL.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libEGL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so b/9/platforms/android-21/arch-arm64/usr/lib/libGLESv1_CM.so
similarity index 63%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libGLESv1_CM.so
index 9676920..03b42cd 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv1_CM.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so b/9/platforms/android-21/arch-arm64/usr/lib/libGLESv2.so
similarity index 62%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libGLESv2.so
index 84c31b0..9790b9f 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv2.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so b/9/platforms/android-21/arch-arm64/usr/lib/libGLESv3.so
similarity index 61%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libGLESv3.so
index 5d10f81..a5144b9 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libGLESv3.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so b/9/platforms/android-21/arch-arm64/usr/lib/libOpenMAXAL.so
similarity index 66%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libOpenMAXAL.so
index a03eccf..71bfa65 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libOpenMAXAL.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so b/9/platforms/android-21/arch-arm64/usr/lib/libOpenSLES.so
similarity index 63%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libOpenSLES.so
index 669d344..948cd7b 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libOpenSLES.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/libandroid.so b/9/platforms/android-21/arch-arm64/usr/lib/libandroid.so
new file mode 100755
index 0000000..60b2fea
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libandroid.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libc.a b/9/platforms/android-21/arch-arm64/usr/lib/libc.a
similarity index 100%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libc.a
rename to 9/platforms/android-21/arch-arm64/usr/lib/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/libc.so b/9/platforms/android-21/arch-arm64/usr/lib/libc.so
new file mode 100755
index 0000000..3cb252c
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libc.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libdl.so b/9/platforms/android-21/arch-arm64/usr/lib/libdl.so
similarity index 84%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libdl.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libdl.so
index d4dc012..dea8bd9 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libdl.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libdl.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so b/9/platforms/android-21/arch-arm64/usr/lib/libjnigraphics.so
similarity index 87%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libjnigraphics.so
index cadb887..00c8088 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libjnigraphics.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/liblog.so b/9/platforms/android-21/arch-arm64/usr/lib/liblog.so
similarity index 83%
rename from 9/platforms/android-19/arch-arm64/usr/lib/liblog.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/liblog.so
index fa47550..6dd5a18 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/liblog.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/liblog.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libm.a b/9/platforms/android-21/arch-arm64/usr/lib/libm.a
similarity index 82%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libm.a
rename to 9/platforms/android-21/arch-arm64/usr/lib/libm.a
index 491c25c..093ca2c 100644
--- a/9/platforms/android-19/arch-arm64/usr/lib/libm.a
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libm.a
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libm.so b/9/platforms/android-21/arch-arm64/usr/lib/libm.so
similarity index 64%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libm.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libm.so
index 39aa2ed..7a5c8f0 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libm.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libm.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/libmediandk.so b/9/platforms/android-21/arch-arm64/usr/lib/libmediandk.so
new file mode 100755
index 0000000..fa0cca2
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a b/9/platforms/android-21/arch-arm64/usr/lib/libstdc++.a
similarity index 99%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a
rename to 9/platforms/android-21/arch-arm64/usr/lib/libstdc++.a
index d2e3b34..99b4856 100644
--- a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.a
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so b/9/platforms/android-21/arch-arm64/usr/lib/libstdc++.so
similarity index 81%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libstdc++.so
index 5987704..fe80092 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libstdc++.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-arm64/usr/lib/libz.a b/9/platforms/android-21/arch-arm64/usr/lib/libz.a
new file mode 100644
index 0000000..e96c721
--- /dev/null
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libz.a
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/lib/libz.so b/9/platforms/android-21/arch-arm64/usr/lib/libz.so
similarity index 70%
rename from 9/platforms/android-19/arch-arm64/usr/lib/libz.so
rename to 9/platforms/android-21/arch-arm64/usr/lib/libz.so
index def78c9..ac0ab59 100755
--- a/9/platforms/android-19/arch-arm64/usr/lib/libz.so
+++ b/9/platforms/android-21/arch-arm64/usr/lib/libz.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h b/9/platforms/android-21/arch-mips/usr/include/EGL/egl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h
copy to 9/platforms/android-21/arch-mips/usr/include/EGL/egl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h b/9/platforms/android-21/arch-mips/usr/include/EGL/eglext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h
copy to 9/platforms/android-21/arch-mips/usr/include/EGL/eglext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h b/9/platforms/android-21/arch-mips/usr/include/EGL/eglplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h
copy to 9/platforms/android-21/arch-mips/usr/include/EGL/eglplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h b/9/platforms/android-21/arch-mips/usr/include/GLES/gl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES/gl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h b/9/platforms/android-21/arch-mips/usr/include/GLES/glext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES/glext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h b/9/platforms/android-21/arch-mips/usr/include/GLES/glplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES/glplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h b/9/platforms/android-21/arch-mips/usr/include/GLES2/gl2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES2/gl2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h b/9/platforms/android-21/arch-mips/usr/include/GLES2/gl2ext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES2/gl2ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h b/9/platforms/android-21/arch-mips/usr/include/GLES2/gl2platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES2/gl2platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h b/9/platforms/android-21/arch-mips/usr/include/GLES3/gl3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES3/gl3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h b/9/platforms/android-21/arch-mips/usr/include/GLES3/gl31.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES3/gl31.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h b/9/platforms/android-21/arch-mips/usr/include/GLES3/gl3ext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES3/gl3ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h b/9/platforms/android-21/arch-mips/usr/include/GLES3/gl3platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h
copy to 9/platforms/android-21/arch-mips/usr/include/GLES3/gl3platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h b/9/platforms/android-21/arch-mips/usr/include/KHR/khrplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h
copy to 9/platforms/android-21/arch-mips/usr/include/KHR/khrplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h b/9/platforms/android-21/arch-mips/usr/include/OMXAL/OpenMAXAL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h
copy to 9/platforms/android-21/arch-mips/usr/include/OMXAL/OpenMAXAL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-21/arch-mips/usr/include/OMXAL/OpenMAXAL_Android.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h
copy to 9/platforms/android-21/arch-mips/usr/include/OMXAL/OpenMAXAL_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h b/9/platforms/android-21/arch-mips/usr/include/OMXAL/OpenMAXAL_Platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h
copy to 9/platforms/android-21/arch-mips/usr/include/OMXAL/OpenMAXAL_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h b/9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h
copy to 9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_Android.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h
copy to 9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h b/9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
copy to 9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h b/9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h
copy to 9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h b/9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_Platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h
copy to 9/platforms/android-21/arch-mips/usr/include/SLES/OpenSLES_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/alloca.h b/9/platforms/android-21/arch-mips/usr/include/alloca.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/alloca.h
copy to 9/platforms/android-21/arch-mips/usr/include/alloca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h b/9/platforms/android-21/arch-mips/usr/include/android/api-level.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/api-level.h
index 9e9c3d6..649efd6 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
+++ b/9/platforms/android-21/arch-mips/usr/include/android/api-level.h
@@ -28,6 +28,6 @@
 #ifndef ANDROID_API_LEVEL_H
 #define ANDROID_API_LEVEL_H
 
-#define __ANDROID_API__ 19
+#define __ANDROID_API__ 21
 
 #endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h b/9/platforms/android-21/arch-mips/usr/include/android/asset_manager.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/asset_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h b/9/platforms/android-21/arch-mips/usr/include/android/asset_manager_jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/asset_manager_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h b/9/platforms/android-21/arch-mips/usr/include/android/bitmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/configuration.h b/9/platforms/android-21/arch-mips/usr/include/android/configuration.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/configuration.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/configuration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h b/9/platforms/android-21/arch-mips/usr/include/android/dlext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/dlext.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/dlext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/input.h b/9/platforms/android-21/arch-mips/usr/include/android/input.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/input.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/input.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h b/9/platforms/android-21/arch-mips/usr/include/android/keycodes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/keycodes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/log.h b/9/platforms/android-21/arch-mips/usr/include/android/log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/log.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/looper.h b/9/platforms/android-21/arch-mips/usr/include/android/looper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/looper.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/looper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h b/9/platforms/android-21/arch-mips/usr/include/android/native_activity.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/native_activity.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window.h b/9/platforms/android-21/arch-mips/usr/include/android/native_window.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_window.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/native_window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h b/9/platforms/android-21/arch-mips/usr/include/android/native_window_jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/native_window_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/obb.h b/9/platforms/android-21/arch-mips/usr/include/android/obb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/obb.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/obb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/rect.h b/9/platforms/android-21/arch-mips/usr/include/android/rect.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/rect.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/rect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/sensor.h b/9/platforms/android-21/arch-mips/usr/include/android/sensor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/sensor.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/sensor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h b/9/platforms/android-21/arch-mips/usr/include/android/storage_manager.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/storage_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/tts.h b/9/platforms/android-21/arch-mips/usr/include/android/tts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/tts.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/tts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/window.h b/9/platforms/android-21/arch-mips/usr/include/android/window.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/window.h
copy to 9/platforms/android-21/arch-mips/usr/include/android/window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ar.h b/9/platforms/android-21/arch-mips/usr/include/ar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ar.h
copy to 9/platforms/android-21/arch-mips/usr/include/ar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h b/9/platforms/android-21/arch-mips/usr/include/arpa/inet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
copy to 9/platforms/android-21/arch-mips/usr/include/arpa/inet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h b/9/platforms/android-21/arch-mips/usr/include/arpa/nameser.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h
copy to 9/platforms/android-21/arch-mips/usr/include/arpa/nameser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h b/9/platforms/android-21/arch-mips/usr/include/arpa/nameser_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h
copy to 9/platforms/android-21/arch-mips/usr/include/arpa/nameser_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h b/9/platforms/android-21/arch-mips/usr/include/arpa/telnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h
copy to 9/platforms/android-21/arch-mips/usr/include/arpa/telnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/bitsperlong.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/bitsperlong.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/errno-base.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/errno-base.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/int-l64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/int-l64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/int-ll64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/int-ll64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/ipcbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/ipcbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/mman-common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/mman-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/msgbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/msgbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/sembuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/sembuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/setup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/setup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/shmbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/shmbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/shmparam.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/shmparam.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/siginfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/siginfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/signal-defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/signal-defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/termbits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h b/9/platforms/android-21/arch-mips/usr/include/asm-generic/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm-generic/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/a.out.h b/9/platforms/android-21/arch-mips/usr/include/asm/a.out.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/a.out.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/a.out.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/auxvec.h b/9/platforms/android-21/arch-mips/usr/include/asm/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/auxvec.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/auxvec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/bitsperlong.h b/9/platforms/android-21/arch-mips/usr/include/asm/bitsperlong.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/bitsperlong.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/bitsperlong.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/break.h b/9/platforms/android-21/arch-mips/usr/include/asm/break.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/break.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/break.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h b/9/platforms/android-21/arch-mips/usr/include/asm/byteorder.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/byteorder.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/cachectl.h b/9/platforms/android-21/arch-mips/usr/include/asm/cachectl.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/cachectl.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/cachectl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/errno.h b/9/platforms/android-21/arch-mips/usr/include/asm/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/errno.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/errno.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/fcntl.h b/9/platforms/android-21/arch-mips/usr/include/asm/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/fcntl.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/fcntl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/inst.h b/9/platforms/android-21/arch-mips/usr/include/asm/inst.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/inst.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/inst.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ioctl.h b/9/platforms/android-21/arch-mips/usr/include/asm/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ioctls.h b/9/platforms/android-21/arch-mips/usr/include/asm/ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/ioctls.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h b/9/platforms/android-21/arch-mips/usr/include/asm/ipcbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/ipcbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/kvm.h b/9/platforms/android-21/arch-mips/usr/include/asm/kvm.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/kvm.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/kvm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/kvm_para.h b/9/platforms/android-21/arch-mips/usr/include/asm/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/kvm_para.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/kvm_para.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/mman.h b/9/platforms/android-21/arch-mips/usr/include/asm/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/mman.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/mman.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/msgbuf.h b/9/platforms/android-21/arch-mips/usr/include/asm/msgbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/msgbuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/msgbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/param.h b/9/platforms/android-21/arch-mips/usr/include/asm/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/param.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/param.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/poll.h b/9/platforms/android-21/arch-mips/usr/include/asm/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/poll.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/poll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/posix_types.h b/9/platforms/android-21/arch-mips/usr/include/asm/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/posix_types.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/posix_types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ptrace.h b/9/platforms/android-21/arch-mips/usr/include/asm/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/ptrace.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/ptrace.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/resource.h b/9/platforms/android-21/arch-mips/usr/include/asm/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/resource.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/resource.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sembuf.h b/9/platforms/android-21/arch-mips/usr/include/asm/sembuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/sembuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/sembuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/setup.h b/9/platforms/android-21/arch-mips/usr/include/asm/setup.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/setup.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/setup.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sgidefs.h b/9/platforms/android-21/arch-mips/usr/include/asm/sgidefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/sgidefs.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/sgidefs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/shmbuf.h b/9/platforms/android-21/arch-mips/usr/include/asm/shmbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/shmbuf.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/shmbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sigcontext.h b/9/platforms/android-21/arch-mips/usr/include/asm/sigcontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/sigcontext.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/sigcontext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/siginfo.h b/9/platforms/android-21/arch-mips/usr/include/asm/siginfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/siginfo.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/siginfo.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/signal.h b/9/platforms/android-21/arch-mips/usr/include/asm/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/signal.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/signal.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/socket.h b/9/platforms/android-21/arch-mips/usr/include/asm/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/socket.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sockios.h b/9/platforms/android-21/arch-mips/usr/include/asm/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/sockios.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/sockios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/stat.h b/9/platforms/android-21/arch-mips/usr/include/asm/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/stat.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/stat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/statfs.h b/9/platforms/android-21/arch-mips/usr/include/asm/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/statfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/statfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/swab.h b/9/platforms/android-21/arch-mips/usr/include/asm/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/swab.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/swab.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sysmips.h b/9/platforms/android-21/arch-mips/usr/include/asm/sysmips.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/sysmips.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/sysmips.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/termbits.h b/9/platforms/android-21/arch-mips/usr/include/asm/termbits.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/termbits.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/termbits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/termios.h b/9/platforms/android-21/arch-mips/usr/include/asm/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/termios.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/termios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/types.h b/9/platforms/android-21/arch-mips/usr/include/asm/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/types.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ucontext.h b/9/platforms/android-21/arch-mips/usr/include/asm/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/ucontext.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/ucontext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/unistd.h b/9/platforms/android-21/arch-mips/usr/include/asm/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/asm/unistd.h
copy to 9/platforms/android-21/arch-mips/usr/include/asm/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/assert.h b/9/platforms/android-21/arch-mips/usr/include/assert.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/assert.h
copy to 9/platforms/android-21/arch-mips/usr/include/assert.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/byteswap.h b/9/platforms/android-21/arch-mips/usr/include/byteswap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/byteswap.h
copy to 9/platforms/android-21/arch-mips/usr/include/byteswap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/complex.h b/9/platforms/android-21/arch-mips/usr/include/complex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/complex.h
copy to 9/platforms/android-21/arch-mips/usr/include/complex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ctype.h b/9/platforms/android-21/arch-mips/usr/include/ctype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ctype.h
copy to 9/platforms/android-21/arch-mips/usr/include/ctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dirent.h b/9/platforms/android-21/arch-mips/usr/include/dirent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/dirent.h
copy to 9/platforms/android-21/arch-mips/usr/include/dirent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dlfcn.h b/9/platforms/android-21/arch-mips/usr/include/dlfcn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/dlfcn.h
copy to 9/platforms/android-21/arch-mips/usr/include/dlfcn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/elf.h b/9/platforms/android-21/arch-mips/usr/include/elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/elf.h
copy to 9/platforms/android-21/arch-mips/usr/include/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/endian.h b/9/platforms/android-21/arch-mips/usr/include/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/endian.h
copy to 9/platforms/android-21/arch-mips/usr/include/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/err.h b/9/platforms/android-21/arch-mips/usr/include/err.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/err.h
copy to 9/platforms/android-21/arch-mips/usr/include/err.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/errno.h b/9/platforms/android-21/arch-mips/usr/include/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/errno.h
copy to 9/platforms/android-21/arch-mips/usr/include/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fcntl.h b/9/platforms/android-21/arch-mips/usr/include/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fcntl.h
copy to 9/platforms/android-21/arch-mips/usr/include/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/features.h b/9/platforms/android-21/arch-mips/usr/include/features.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/features.h
copy to 9/platforms/android-21/arch-mips/usr/include/features.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fenv.h b/9/platforms/android-21/arch-mips/usr/include/fenv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fenv.h
copy to 9/platforms/android-21/arch-mips/usr/include/fenv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fnmatch.h b/9/platforms/android-21/arch-mips/usr/include/fnmatch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fnmatch.h
copy to 9/platforms/android-21/arch-mips/usr/include/fnmatch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fts.h b/9/platforms/android-21/arch-mips/usr/include/fts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fts.h
copy to 9/platforms/android-21/arch-mips/usr/include/fts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ftw.h b/9/platforms/android-21/arch-mips/usr/include/ftw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ftw.h
copy to 9/platforms/android-21/arch-mips/usr/include/ftw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/getopt.h b/9/platforms/android-21/arch-mips/usr/include/getopt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/getopt.h
copy to 9/platforms/android-21/arch-mips/usr/include/getopt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/grp.h b/9/platforms/android-21/arch-mips/usr/include/grp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/grp.h
copy to 9/platforms/android-21/arch-mips/usr/include/grp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/inttypes.h b/9/platforms/android-21/arch-mips/usr/include/inttypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/inttypes.h
copy to 9/platforms/android-21/arch-mips/usr/include/inttypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/jni.h b/9/platforms/android-21/arch-mips/usr/include/jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/jni.h
copy to 9/platforms/android-21/arch-mips/usr/include/jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/lastlog.h b/9/platforms/android-21/arch-mips/usr/include/lastlog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/lastlog.h
copy to 9/platforms/android-21/arch-mips/usr/include/lastlog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/libgen.h b/9/platforms/android-21/arch-mips/usr/include/libgen.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/libgen.h
copy to 9/platforms/android-21/arch-mips/usr/include/libgen.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/limits.h b/9/platforms/android-21/arch-mips/usr/include/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/limits.h
copy to 9/platforms/android-21/arch-mips/usr/include/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/link.h b/9/platforms/android-21/arch-mips/usr/include/link.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/link.h
copy to 9/platforms/android-21/arch-mips/usr/include/link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h b/9/platforms/android-21/arch-mips/usr/include/linux/a.out.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/a.out.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/acct.h b/9/platforms/android-21/arch-mips/usr/include/linux/acct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/acct.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adb.h b/9/platforms/android-21/arch-mips/usr/include/linux/adb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/adb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/adb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/adfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/adfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h b/9/platforms/android-21/arch-mips/usr/include/linux/affs_hardblocks.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/affs_hardblocks.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h b/9/platforms/android-21/arch-mips/usr/include/linux/agpgart.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/agpgart.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h b/9/platforms/android-21/arch-mips/usr/include/linux/aio_abi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/aio_abi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h b/9/platforms/android-21/arch-mips/usr/include/linux/android_alarm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/android_alarm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h b/9/platforms/android-21/arch-mips/usr/include/linux/apm_bios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/apm_bios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h b/9/platforms/android-21/arch-mips/usr/include/linux/arcfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/arcfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h b/9/platforms/android-21/arch-mips/usr/include/linux/ashmem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ashmem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h b/9/platforms/android-21/arch-mips/usr/include/linux/atalk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm_eni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm_eni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm_he.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm_he.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm_idt77105.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm_idt77105.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm_nicstar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm_nicstar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm_tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h b/9/platforms/android-21/arch-mips/usr/include/linux/atm_zatm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atm_zatm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmapi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmarp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmarp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmbr2684.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmbr2684.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmclip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmclip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmioc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmioc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmlec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmlec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmmpc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmmpc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmsap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmsap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h b/9/platforms/android-21/arch-mips/usr/include/linux/atmsvc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/atmsvc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/audit.h b/9/platforms/android-21/arch-mips/usr/include/linux/audit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/audit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/audit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/auto_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/auto_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h b/9/platforms/android-21/arch-mips/usr/include/linux/auto_fs4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/auto_fs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h b/9/platforms/android-21/arch-mips/usr/include/linux/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h b/9/platforms/android-21/arch-mips/usr/include/linux/ax25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ax25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h b/9/platforms/android-21/arch-mips/usr/include/linux/b1lli.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/b1lli.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h b/9/platforms/android-21/arch-mips/usr/include/linux/baycom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/baycom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h b/9/platforms/android-21/arch-mips/usr/include/linux/bcache.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/bcache.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h b/9/platforms/android-21/arch-mips/usr/include/linux/bcm933xx_hcs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/bcm933xx_hcs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/bfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/bfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binder.h b/9/platforms/android-21/arch-mips/usr/include/linux/binder.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/binder.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/binder.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h b/9/platforms/android-21/arch-mips/usr/include/linux/binfmts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/binfmts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h b/9/platforms/android-21/arch-mips/usr/include/linux/blkpg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/blkpg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h b/9/platforms/android-21/arch-mips/usr/include/linux/blktrace_api.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/blktrace_api.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h b/9/platforms/android-21/arch-mips/usr/include/linux/bpqether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/bpqether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h b/9/platforms/android-21/arch-mips/usr/include/linux/bsg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/bsg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h b/9/platforms/android-21/arch-mips/usr/include/linux/btrfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/btrfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h b/9/platforms/android-21/arch-mips/usr/include/linux/byteorder/big_endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/byteorder/big_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h b/9/platforms/android-21/arch-mips/usr/include/linux/byteorder/little_endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/byteorder/little_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h b/9/platforms/android-21/arch-mips/usr/include/linux/caif/caif_socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/caif/caif_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h b/9/platforms/android-21/arch-mips/usr/include/linux/caif/if_caif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/caif/if_caif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can.h b/9/platforms/android-21/arch-mips/usr/include/linux/can.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/can.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h b/9/platforms/android-21/arch-mips/usr/include/linux/can/bcm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/can/bcm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h b/9/platforms/android-21/arch-mips/usr/include/linux/can/error.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/can/error.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h b/9/platforms/android-21/arch-mips/usr/include/linux/can/gw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/can/gw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/can/netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/can/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h b/9/platforms/android-21/arch-mips/usr/include/linux/can/raw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/can/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capability.h b/9/platforms/android-21/arch-mips/usr/include/linux/capability.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/capability.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capi.h b/9/platforms/android-21/arch-mips/usr/include/linux/capi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/capi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/capi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h b/9/platforms/android-21/arch-mips/usr/include/linux/cciss_defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cciss_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/cciss_ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cciss_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h b/9/platforms/android-21/arch-mips/usr/include/linux/cdrom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cdrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h b/9/platforms/android-21/arch-mips/usr/include/linux/cgroupstats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cgroupstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/chio.h b/9/platforms/android-21/arch-mips/usr/include/linux/chio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/chio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/chio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h b/9/platforms/android-21/arch-mips/usr/include/linux/cifs/cifs_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cifs/cifs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h b/9/platforms/android-21/arch-mips/usr/include/linux/cm4000_cs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cm4000_cs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h b/9/platforms/android-21/arch-mips/usr/include/linux/cn_proc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cn_proc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda.h b/9/platforms/android-21/arch-mips/usr/include/linux/coda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coda.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/coda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h b/9/platforms/android-21/arch-mips/usr/include/linux/coda_psdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/coda_psdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coff.h b/9/platforms/android-21/arch-mips/usr/include/linux/coff.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coff.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/coff.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h b/9/platforms/android-21/arch-mips/usr/include/linux/compiler.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/compiler.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/connector.h b/9/platforms/android-21/arch-mips/usr/include/linux/connector.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/connector.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/connector.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/const.h b/9/platforms/android-21/arch-mips/usr/include/linux/const.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/const.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/const.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/cramfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cramfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h b/9/platforms/android-21/arch-mips/usr/include/linux/cuda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cuda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h b/9/platforms/android-21/arch-mips/usr/include/linux/cyclades.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cyclades.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h b/9/platforms/android-21/arch-mips/usr/include/linux/cycx_cfm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/cycx_cfm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h b/9/platforms/android-21/arch-mips/usr/include/linux/dcbnl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dcbnl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h b/9/platforms/android-21/arch-mips/usr/include/linux/dccp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h b/9/platforms/android-21/arch-mips/usr/include/linux/dlm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dlm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h b/9/platforms/android-21/arch-mips/usr/include/linux/dlm_device.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dlm_device.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/dlm_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dlm_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h b/9/platforms/android-21/arch-mips/usr/include/linux/dlm_plock.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dlm_plock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h b/9/platforms/android-21/arch-mips/usr/include/linux/dlmconstants.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dlmconstants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/dm-ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dm-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h b/9/platforms/android-21/arch-mips/usr/include/linux/dm-log-userspace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dm-log-userspace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dn.h b/9/platforms/android-21/arch-mips/usr/include/linux/dn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dn.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h b/9/platforms/android-21/arch-mips/usr/include/linux/dqblk_xfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dqblk_xfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/audio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/ca.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/ca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/dmx.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/dmx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/frontend.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/frontend.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/osd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/osd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/version.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h b/9/platforms/android-21/arch-mips/usr/include/linux/dvb/video.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/dvb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/edd.h b/9/platforms/android-21/arch-mips/usr/include/linux/edd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/edd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/edd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h b/9/platforms/android-21/arch-mips/usr/include/linux/efs_fs_sb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/efs_fs_sb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h b/9/platforms/android-21/arch-mips/usr/include/linux/elf-em.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/elf-em.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h b/9/platforms/android-21/arch-mips/usr/include/linux/elf-fdpic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/elf-fdpic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf.h b/9/platforms/android-21/arch-mips/usr/include/linux/elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h b/9/platforms/android-21/arch-mips/usr/include/linux/elfcore.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/elfcore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errno.h b/9/platforms/android-21/arch-mips/usr/include/linux/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/errno.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h b/9/platforms/android-21/arch-mips/usr/include/linux/errqueue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/errqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h b/9/platforms/android-21/arch-mips/usr/include/linux/ethtool.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ethtool.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h b/9/platforms/android-21/arch-mips/usr/include/linux/eventpoll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/eventpoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h b/9/platforms/android-21/arch-mips/usr/include/linux/fadvise.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fadvise.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h b/9/platforms/android-21/arch-mips/usr/include/linux/falloc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/falloc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h b/9/platforms/android-21/arch-mips/usr/include/linux/fanotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fanotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fb.h b/9/platforms/android-21/arch-mips/usr/include/linux/fb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h b/9/platforms/android-21/arch-mips/usr/include/linux/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fd.h b/9/platforms/android-21/arch-mips/usr/include/linux/fd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h b/9/platforms/android-21/arch-mips/usr/include/linux/fdreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h b/9/platforms/android-21/arch-mips/usr/include/linux/fib_rules.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fib_rules.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h b/9/platforms/android-21/arch-mips/usr/include/linux/fiemap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fiemap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/filter.h b/9/platforms/android-21/arch-mips/usr/include/linux/filter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/filter.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/filter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h b/9/platforms/android-21/arch-mips/usr/include/linux/firewire-cdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/firewire-cdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h b/9/platforms/android-21/arch-mips/usr/include/linux/firewire-constants.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/firewire-constants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/flat.h b/9/platforms/android-21/arch-mips/usr/include/linux/flat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/flat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/flat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h b/9/platforms/android-21/arch-mips/usr/include/linux/fsl_hypervisor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fsl_hypervisor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h b/9/platforms/android-21/arch-mips/usr/include/linux/fuse.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/fuse.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/futex.h b/9/platforms/android-21/arch-mips/usr/include/linux/futex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/futex.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/futex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h b/9/platforms/android-21/arch-mips/usr/include/linux/gameport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/gameport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h b/9/platforms/android-21/arch-mips/usr/include/linux/gen_stats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/gen_stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/genetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/genetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h b/9/platforms/android-21/arch-mips/usr/include/linux/genwqe/genwqe_card.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/genwqe/genwqe_card.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h b/9/platforms/android-21/arch-mips/usr/include/linux/gfs2_ondisk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/gfs2_ondisk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h b/9/platforms/android-21/arch-mips/usr/include/linux/gigaset_dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/gigaset_dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h b/9/platforms/android-21/arch-mips/usr/include/linux/hash_info.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hash_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h b/9/platforms/android-21/arch-mips/usr/include/linux/hdlc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hdlc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/hdlc/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hdlc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h b/9/platforms/android-21/arch-mips/usr/include/linux/hdlcdrv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hdlcdrv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h b/9/platforms/android-21/arch-mips/usr/include/linux/hdreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hid.h b/9/platforms/android-21/arch-mips/usr/include/linux/hid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hid.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h b/9/platforms/android-21/arch-mips/usr/include/linux/hiddev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hiddev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h b/9/platforms/android-21/arch-mips/usr/include/linux/hidraw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hidraw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h b/9/platforms/android-21/arch-mips/usr/include/linux/hpet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hpet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h b/9/platforms/android-21/arch-mips/usr/include/linux/hsi/hsi_char.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hsi/hsi_char.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/hsr_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hsr_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h b/9/platforms/android-21/arch-mips/usr/include/linux/hw_breakpoint.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h b/9/platforms/android-21/arch-mips/usr/include/linux/hysdn_if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/hysdn_if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h b/9/platforms/android-21/arch-mips/usr/include/linux/i2c-dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/i2c-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h b/9/platforms/android-21/arch-mips/usr/include/linux/i2c.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/i2c.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h b/9/platforms/android-21/arch-mips/usr/include/linux/i2o-dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/i2o-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h b/9/platforms/android-21/arch-mips/usr/include/linux/i8k.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/i8k.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h b/9/platforms/android-21/arch-mips/usr/include/linux/icmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h b/9/platforms/android-21/arch-mips/usr/include/linux/icmpv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/icmpv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if.h b/9/platforms/android-21/arch-mips/usr/include/linux/if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_addr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_addr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_addrlabel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_addrlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_alg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_alg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_arcnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_arcnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_bonding.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_bonding.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_bridge.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_cablemodem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_cablemodem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_eql.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_eql.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_fc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_fc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_fddi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_fddi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_frad.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_frad.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_hippi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_hippi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_infiniband.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_infiniband.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_link.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_ltalk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_ltalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_phonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_plip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_plip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_ppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_pppol2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_pppol2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_pppolac.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_pppolac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_pppopns.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_pppopns.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_pppox.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_pppox.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_slip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_slip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_team.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_team.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_tun.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_tun.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_tunnel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_vlan.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h b/9/platforms/android-21/arch-mips/usr/include/linux/if_x25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/if_x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h b/9/platforms/android-21/arch-mips/usr/include/linux/igmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/igmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in.h b/9/platforms/android-21/arch-mips/usr/include/linux/in.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in6.h b/9/platforms/android-21/arch-mips/usr/include/linux/in6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in6.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h b/9/platforms/android-21/arch-mips/usr/include/linux/in_route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/in_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h b/9/platforms/android-21/arch-mips/usr/include/linux/inet_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/inet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h b/9/platforms/android-21/arch-mips/usr/include/linux/inotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h b/9/platforms/android-21/arch-mips/usr/include/linux/input.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/input.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/input.h
index df3200c..b9d5b2a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h
+++ b/9/platforms/android-21/arch-mips/usr/include/linux/input.h
@@ -97,629 +97,644 @@
 #define INPUT_PROP_BUTTONPAD 0x02
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define INPUT_PROP_SEMI_MT 0x03
+#define INPUT_PROP_TOPBUTTONPAD 0x04
 #define INPUT_PROP_MAX 0x1f
 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_SYN 0x00
 #define EV_KEY 0x01
 #define EV_REL 0x02
 #define EV_ABS 0x03
-#define EV_MSC 0x04
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MSC 0x04
 #define EV_SW 0x05
 #define EV_LED 0x11
 #define EV_SND 0x12
-#define EV_REP 0x14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_REP 0x14
 #define EV_FF 0x15
 #define EV_PWR 0x16
 #define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MAX 0x1f
 #define EV_CNT (EV_MAX+1)
 #define SYN_REPORT 0
 #define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SYN_MT_REPORT 2
 #define SYN_DROPPED 3
 #define SYN_MAX 0xf
 #define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RESERVED 0
 #define KEY_ESC 1
 #define KEY_1 2
 #define KEY_2 3
-#define KEY_3 4
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_3 4
 #define KEY_4 5
 #define KEY_5 6
 #define KEY_6 7
-#define KEY_7 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_7 8
 #define KEY_8 9
 #define KEY_9 10
 #define KEY_0 11
-#define KEY_MINUS 12
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MINUS 12
 #define KEY_EQUAL 13
 #define KEY_BACKSPACE 14
 #define KEY_TAB 15
-#define KEY_Q 16
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Q 16
 #define KEY_W 17
 #define KEY_E 18
 #define KEY_R 19
-#define KEY_T 20
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_T 20
 #define KEY_Y 21
 #define KEY_U 22
 #define KEY_I 23
-#define KEY_O 24
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_O 24
 #define KEY_P 25
 #define KEY_LEFTBRACE 26
 #define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ENTER 28
 #define KEY_LEFTCTRL 29
 #define KEY_A 30
 #define KEY_S 31
-#define KEY_D 32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_D 32
 #define KEY_F 33
 #define KEY_G 34
 #define KEY_H 35
-#define KEY_J 36
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_J 36
 #define KEY_K 37
 #define KEY_L 38
 #define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_APOSTROPHE 40
 #define KEY_GRAVE 41
 #define KEY_LEFTSHIFT 42
 #define KEY_BACKSLASH 43
-#define KEY_Z 44
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Z 44
 #define KEY_X 45
 #define KEY_C 46
 #define KEY_V 47
-#define KEY_B 48
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_B 48
 #define KEY_N 49
 #define KEY_M 50
 #define KEY_COMMA 51
-#define KEY_DOT 52
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DOT 52
 #define KEY_SLASH 53
 #define KEY_RIGHTSHIFT 54
 #define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFTALT 56
 #define KEY_SPACE 57
 #define KEY_CAPSLOCK 58
 #define KEY_F1 59
-#define KEY_F2 60
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F2 60
 #define KEY_F3 61
 #define KEY_F4 62
 #define KEY_F5 63
-#define KEY_F6 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F6 64
 #define KEY_F7 65
 #define KEY_F8 66
 #define KEY_F9 67
-#define KEY_F10 68
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F10 68
 #define KEY_NUMLOCK 69
 #define KEY_SCROLLLOCK 70
 #define KEY_KP7 71
-#define KEY_KP8 72
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP8 72
 #define KEY_KP9 73
 #define KEY_KPMINUS 74
 #define KEY_KP4 75
-#define KEY_KP5 76
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP5 76
 #define KEY_KP6 77
 #define KEY_KPPLUS 78
 #define KEY_KP1 79
-#define KEY_KP2 80
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP2 80
 #define KEY_KP3 81
 #define KEY_KP0 82
 #define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ZENKAKUHANKAKU 85
 #define KEY_102ND 86
 #define KEY_F11 87
 #define KEY_F12 88
-#define KEY_RO 89
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RO 89
 #define KEY_KATAKANA 90
 #define KEY_HIRAGANA 91
 #define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KATAKANAHIRAGANA 93
 #define KEY_MUHENKAN 94
 #define KEY_KPJPCOMMA 95
 #define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RIGHTCTRL 97
 #define KEY_KPSLASH 98
 #define KEY_SYSRQ 99
 #define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LINEFEED 101
 #define KEY_HOME 102
 #define KEY_UP 103
 #define KEY_PAGEUP 104
-#define KEY_LEFT 105
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFT 105
 #define KEY_RIGHT 106
 #define KEY_END 107
 #define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PAGEDOWN 109
 #define KEY_INSERT 110
 #define KEY_DELETE 111
 #define KEY_MACRO 112
-#define KEY_MUTE 113
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MUTE 113
 #define KEY_VOLUMEDOWN 114
 #define KEY_VOLUMEUP 115
 #define KEY_POWER 116
-#define KEY_KPEQUAL 117
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPEQUAL 117
 #define KEY_KPPLUSMINUS 118
 #define KEY_PAUSE 119
 #define KEY_SCALE 120
-#define KEY_KPCOMMA 121
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPCOMMA 121
 #define KEY_HANGEUL 122
 #define KEY_HANGUEL KEY_HANGEUL
 #define KEY_HANJA 123
-#define KEY_YEN 124
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_YEN 124
 #define KEY_LEFTMETA 125
 #define KEY_RIGHTMETA 126
 #define KEY_COMPOSE 127
-#define KEY_STOP 128
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_STOP 128
 #define KEY_AGAIN 129
 #define KEY_PROPS 130
 #define KEY_UNDO 131
-#define KEY_FRONT 132
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FRONT 132
 #define KEY_COPY 133
 #define KEY_OPEN 134
 #define KEY_PASTE 135
-#define KEY_FIND 136
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FIND 136
 #define KEY_CUT 137
 #define KEY_HELP 138
 #define KEY_MENU 139
-#define KEY_CALC 140
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CALC 140
 #define KEY_SETUP 141
 #define KEY_SLEEP 142
 #define KEY_WAKEUP 143
-#define KEY_FILE 144
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FILE 144
 #define KEY_SENDFILE 145
 #define KEY_DELETEFILE 146
 #define KEY_XFER 147
-#define KEY_PROG1 148
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PROG1 148
 #define KEY_PROG2 149
 #define KEY_WWW 150
 #define KEY_MSDOS 151
-#define KEY_COFFEE 152
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_COFFEE 152
 #define KEY_SCREENLOCK KEY_COFFEE
 #define KEY_DIRECTION 153
 #define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MAIL 155
 #define KEY_BOOKMARKS 156
 #define KEY_COMPUTER 157
 #define KEY_BACK 158
-#define KEY_FORWARD 159
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FORWARD 159
 #define KEY_CLOSECD 160
 #define KEY_EJECTCD 161
 #define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_NEXTSONG 163
 #define KEY_PLAYPAUSE 164
 #define KEY_PREVIOUSSONG 165
 #define KEY_STOPCD 166
-#define KEY_RECORD 167
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RECORD 167
 #define KEY_REWIND 168
 #define KEY_PHONE 169
 #define KEY_ISO 170
-#define KEY_CONFIG 171
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CONFIG 171
 #define KEY_HOMEPAGE 172
 #define KEY_REFRESH 173
 #define KEY_EXIT 174
-#define KEY_MOVE 175
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MOVE 175
 #define KEY_EDIT 176
 #define KEY_SCROLLUP 177
 #define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPLEFTPAREN 179
 #define KEY_KPRIGHTPAREN 180
 #define KEY_NEW 181
 #define KEY_REDO 182
-#define KEY_F13 183
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F13 183
 #define KEY_F14 184
 #define KEY_F15 185
 #define KEY_F16 186
-#define KEY_F17 187
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F17 187
 #define KEY_F18 188
 #define KEY_F19 189
 #define KEY_F20 190
-#define KEY_F21 191
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F21 191
 #define KEY_F22 192
 #define KEY_F23 193
 #define KEY_F24 194
-#define KEY_PLAYCD 200
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PLAYCD 200
 #define KEY_PAUSECD 201
 #define KEY_PROG3 202
 #define KEY_PROG4 203
-#define KEY_DASHBOARD 204
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DASHBOARD 204
 #define KEY_SUSPEND 205
 #define KEY_CLOSE 206
 #define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FASTFORWARD 208
 #define KEY_BASSBOOST 209
 #define KEY_PRINT 210
 #define KEY_HP 211
-#define KEY_CAMERA 212
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CAMERA 212
 #define KEY_SOUND 213
 #define KEY_QUESTION 214
 #define KEY_EMAIL 215
-#define KEY_CHAT 216
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CHAT 216
 #define KEY_SEARCH 217
 #define KEY_CONNECT 218
 #define KEY_FINANCE 219
-#define KEY_SPORT 220
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SPORT 220
 #define KEY_SHOP 221
 #define KEY_ALTERASE 222
 #define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESSDOWN 224
 #define KEY_BRIGHTNESSUP 225
 #define KEY_MEDIA 226
 #define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KBDILLUMTOGGLE 228
 #define KEY_KBDILLUMDOWN 229
 #define KEY_KBDILLUMUP 230
 #define KEY_SEND 231
-#define KEY_REPLY 232
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_REPLY 232
 #define KEY_FORWARDMAIL 233
 #define KEY_SAVE 234
 #define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BATTERY 236
 #define KEY_BLUETOOTH 237
 #define KEY_WLAN 238
 #define KEY_UWB 239
-#define KEY_UNKNOWN 240
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_UNKNOWN 240
 #define KEY_VIDEO_NEXT 241
 #define KEY_VIDEO_PREV 242
 #define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_AUTO 244
+#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF 245
 #define KEY_WWAN 246
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WIMAX KEY_WWAN
 #define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MICMUTE 248
 #define BTN_MISC 0x100
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_0 0x100
 #define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_2 0x102
 #define BTN_3 0x103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_4 0x104
 #define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_6 0x106
 #define BTN_7 0x107
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_8 0x108
 #define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MOUSE 0x110
 #define BTN_LEFT 0x110
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_RIGHT 0x111
 #define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SIDE 0x113
 #define BTN_EXTRA 0x114
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_FORWARD 0x115
 #define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TASK 0x117
 #define BTN_JOYSTICK 0x120
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER 0x120
 #define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMB2 0x122
 #define BTN_TOP 0x123
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOP2 0x124
 #define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE 0x126
 #define BTN_BASE2 0x127
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE3 0x128
 #define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE5 0x12a
 #define BTN_BASE6 0x12b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DEAD 0x12f
 #define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SOUTH 0x130
 #define BTN_A BTN_SOUTH
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_EAST 0x131
 #define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_C 0x132
 #define BTN_NORTH 0x133
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_X BTN_NORTH
 #define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_Y BTN_WEST
 #define BTN_Z 0x135
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL 0x136
 #define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL2 0x138
 #define BTN_TR2 0x139
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SELECT 0x13a
 #define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MODE 0x13c
 #define BTN_THUMBL 0x13d
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMBR 0x13e
 #define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_PEN 0x140
 #define BTN_TOOL_RUBBER 0x141
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_BRUSH 0x142
 #define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_AIRBRUSH 0x144
 #define BTN_TOOL_FINGER 0x145
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_MOUSE 0x146
 #define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUINTTAP 0x148
 #define BTN_TOUCH 0x14a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_STYLUS 0x14b
 #define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_DOUBLETAP 0x14d
 #define BTN_TOOL_TRIPLETAP 0x14e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUADTAP 0x14f
 #define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_GEAR_DOWN 0x150
 #define BTN_GEAR_UP 0x151
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_OK 0x160
 #define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GOTO 0x162
 #define KEY_CLEAR 0x163
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_POWER2 0x164
 #define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_INFO 0x166
 #define KEY_TIME 0x167
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VENDOR 0x168
 #define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PROGRAM 0x16a
 #define KEY_CHANNEL 0x16b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FAVORITES 0x16c
 #define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PVR 0x16e
 #define KEY_MHP 0x16f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_LANGUAGE 0x170
 #define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SUBTITLE 0x172
 #define KEY_ANGLE 0x173
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOM 0x174
 #define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_KEYBOARD 0x176
 #define KEY_SCREEN 0x177
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PC 0x178
 #define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TV2 0x17a
 #define KEY_VCR 0x17b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VCR2 0x17c
 #define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SAT2 0x17e
 #define KEY_CD 0x17f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TAPE 0x180
 #define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TUNER 0x182
 #define KEY_PLAYER 0x183
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEXT 0x184
 #define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUX 0x186
 #define KEY_MP3 0x187
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUDIO 0x188
 #define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DIRECTORY 0x18a
 #define KEY_LIST 0x18b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEMO 0x18c
 #define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RED 0x18e
 #define KEY_GREEN 0x18f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_YELLOW 0x190
 #define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CHANNELUP 0x192
 #define KEY_CHANNELDOWN 0x193
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FIRST 0x194
 #define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AB 0x196
 #define KEY_NEXT 0x197
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RESTART 0x198
 #define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SHUFFLE 0x19a
 #define KEY_BREAK 0x19b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PREVIOUS 0x19c
 #define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEEN 0x19e
 #define KEY_TWEN 0x19f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VIDEOPHONE 0x1a0
 #define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMIN 0x1a2
 #define KEY_ZOOMOUT 0x1a3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMRESET 0x1a4
 #define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EDITOR 0x1a6
 #define KEY_SPREADSHEET 0x1a7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GRAPHICSEDITOR 0x1a8
 #define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DATABASE 0x1aa
 #define KEY_NEWS 0x1ab
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VOICEMAIL 0x1ac
 #define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MESSENGER 0x1ae
 #define KEY_DISPLAYTOGGLE 0x1af
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK 0x1b0
 #define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DOLLAR 0x1b2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EURO 0x1b3
 #define KEY_FRAMEBACK 0x1b4
 #define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CONTEXT_MENU 0x1b6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEDIA_REPEAT 0x1b7
 #define KEY_10CHANNELSUP 0x1b8
 #define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_IMAGES 0x1ba
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_EOL 0x1c0
 #define KEY_DEL_EOS 0x1c1
 #define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_LINE 0x1c3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN 0x1d0
 #define KEY_FN_ESC 0x1d1
 #define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F2 0x1d3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F3 0x1d4
 #define KEY_FN_F4 0x1d5
 #define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F6 0x1d7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F7 0x1d8
 #define KEY_FN_F8 0x1d9
 #define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F10 0x1db
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F11 0x1dc
 #define KEY_FN_F12 0x1dd
 #define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_2 0x1df
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_D 0x1e0
 #define KEY_FN_E 0x1e1
 #define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_S 0x1e3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_B 0x1e4
 #define KEY_BRL_DOT1 0x1f1
 #define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT3 0x1f3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT4 0x1f4
 #define KEY_BRL_DOT5 0x1f5
 #define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT7 0x1f7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT8 0x1f8
 #define KEY_BRL_DOT9 0x1f9
 #define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_0 0x200
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_1 0x201
 #define KEY_NUMERIC_2 0x202
 #define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_4 0x204
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_5 0x205
 #define KEY_NUMERIC_6 0x206
 #define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_8 0x208
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_9 0x209
 #define KEY_NUMERIC_STAR 0x20a
 #define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_FOCUS 0x210
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WPS_BUTTON 0x211
 #define KEY_TOUCHPAD_TOGGLE 0x212
 #define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TOUCHPAD_OFF 0x214
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_ZOOMIN 0x215
 #define KEY_CAMERA_ZOOMOUT 0x216
 #define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_DOWN 0x218
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_LEFT 0x219
 #define KEY_CAMERA_RIGHT 0x21a
 #define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_OFF 0x21c
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_TOGGLE 0x21d
 #define KEY_LIGHTS_TOGGLE 0x21e
 #define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_DOWN 0x221
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_LEFT 0x222
 #define BTN_DPAD_RIGHT 0x223
 #define KEY_ALS_TOGGLE 0x230
+#define KEY_BUTTONCONFIG 0x240
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_TASKMANAGER 0x241
+#define KEY_JOURNAL 0x242
+#define KEY_CONTROLPANEL 0x243
+#define KEY_APPSELECT 0x244
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SCREENSAVER 0x245
+#define KEY_VOICECOMMAND 0x246
+#define KEY_BRIGHTNESS_MIN 0x250
+#define KEY_BRIGHTNESS_MAX 0x251
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER_HAPPY 0x2c0
 #define BTN_TRIGGER_HAPPY1 0x2c0
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ion.h b/9/platforms/android-21/arch-mips/usr/include/linux/ion.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ion.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ion.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h b/9/platforms/android-21/arch-mips/usr/include/linux/ioprio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ioprio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip.h b/9/platforms/android-21/arch-mips/usr/include/linux/ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h b/9/platforms/android-21/arch-mips/usr/include/linux/ip6_tunnel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ip6_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h b/9/platforms/android-21/arch-mips/usr/include/linux/ip_vs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ip_vs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipmi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipmi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipmi_msgdefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipmi_msgdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipsec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipsec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipv6_route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipv6_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h b/9/platforms/android-21/arch-mips/usr/include/linux/ipx.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ipx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irda.h b/9/platforms/android-21/arch-mips/usr/include/linux/irda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/irda.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/irda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h b/9/platforms/android-21/arch-mips/usr/include/linux/irqnr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/irqnr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h b/9/platforms/android-21/arch-mips/usr/include/linux/isdn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/isdn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h b/9/platforms/android-21/arch-mips/usr/include/linux/isdn/capicmd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/isdn/capicmd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h b/9/platforms/android-21/arch-mips/usr/include/linux/isdn_divertif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/isdn_divertif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h b/9/platforms/android-21/arch-mips/usr/include/linux/isdn_ppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/isdn_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h b/9/platforms/android-21/arch-mips/usr/include/linux/isdnif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/isdnif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/iso_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/iso_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h b/9/platforms/android-21/arch-mips/usr/include/linux/ivtv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ivtv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h b/9/platforms/android-21/arch-mips/usr/include/linux/ivtvfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ivtvfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h b/9/platforms/android-21/arch-mips/usr/include/linux/ixjuser.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ixjuser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h b/9/platforms/android-21/arch-mips/usr/include/linux/jffs2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/jffs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h b/9/platforms/android-21/arch-mips/usr/include/linux/joystick.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/joystick.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kd.h b/9/platforms/android-21/arch-mips/usr/include/linux/kd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h b/9/platforms/android-21/arch-mips/usr/include/linux/kdev_t.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kdev_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h b/9/platforms/android-21/arch-mips/usr/include/linux/kernel-page-flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kernel-page-flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h b/9/platforms/android-21/arch-mips/usr/include/linux/kernel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kernel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h b/9/platforms/android-21/arch-mips/usr/include/linux/kernelcapi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kernelcapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h b/9/platforms/android-21/arch-mips/usr/include/linux/kexec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kexec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h b/9/platforms/android-21/arch-mips/usr/include/linux/keyboard.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/keyboard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h b/9/platforms/android-21/arch-mips/usr/include/linux/keychord.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/keychord.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/keyctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/keyctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h b/9/platforms/android-21/arch-mips/usr/include/linux/kvm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kvm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h b/9/platforms/android-21/arch-mips/usr/include/linux/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h b/9/platforms/android-21/arch-mips/usr/include/linux/l2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h b/9/platforms/android-21/arch-mips/usr/include/linux/libc-compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/libc-compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/limits.h b/9/platforms/android-21/arch-mips/usr/include/linux/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/limits.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/llc.h b/9/platforms/android-21/arch-mips/usr/include/linux/llc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/llc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/llc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/loop.h b/9/platforms/android-21/arch-mips/usr/include/linux/loop.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/loop.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/loop.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/lp.h b/9/platforms/android-21/arch-mips/usr/include/linux/lp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/lp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/lp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/magic.h b/9/platforms/android-21/arch-mips/usr/include/linux/magic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/magic.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/magic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/major.h b/9/platforms/android-21/arch-mips/usr/include/linux/major.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/major.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/major.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h b/9/platforms/android-21/arch-mips/usr/include/linux/map_to_7segment.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/map_to_7segment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h b/9/platforms/android-21/arch-mips/usr/include/linux/matroxfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/matroxfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h b/9/platforms/android-21/arch-mips/usr/include/linux/mdio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/media.h b/9/platforms/android-21/arch-mips/usr/include/linux/media.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/media.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/media.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mei.h b/9/platforms/android-21/arch-mips/usr/include/linux/mei.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mei.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mei.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h b/9/platforms/android-21/arch-mips/usr/include/linux/mempolicy.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mempolicy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/meye.h b/9/platforms/android-21/arch-mips/usr/include/linux/meye.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/meye.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/meye.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h b/9/platforms/android-21/arch-mips/usr/include/linux/mic_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mic_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/mic_ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mic_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mii.h b/9/platforms/android-21/arch-mips/usr/include/linux/mii.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mii.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mii.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/minix_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/minix_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mman.h b/9/platforms/android-21/arch-mips/usr/include/linux/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mman.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/mmc/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mmc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h b/9/platforms/android-21/arch-mips/usr/include/linux/mmtimer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mmtimer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/module.h b/9/platforms/android-21/arch-mips/usr/include/linux/module.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/module.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/module.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h b/9/platforms/android-21/arch-mips/usr/include/linux/mqueue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h b/9/platforms/android-21/arch-mips/usr/include/linux/mroute.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mroute.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h b/9/platforms/android-21/arch-mips/usr/include/linux/mroute6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mroute6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/msdos_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/msdos_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msg.h b/9/platforms/android-21/arch-mips/usr/include/linux/msg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/msg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h b/9/platforms/android-21/arch-mips/usr/include/linux/mtio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/mtio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h b/9/platforms/android-21/arch-mips/usr/include/linux/n_r3964.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/n_r3964.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h b/9/platforms/android-21/arch-mips/usr/include/linux/nbd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nbd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h b/9/platforms/android-21/arch-mips/usr/include/linux/ncp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ncp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/ncp_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ncp_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h b/9/platforms/android-21/arch-mips/usr/include/linux/ncp_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ncp_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h b/9/platforms/android-21/arch-mips/usr/include/linux/ncp_no.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ncp_no.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h b/9/platforms/android-21/arch-mips/usr/include/linux/neighbour.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/neighbour.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net.h b/9/platforms/android-21/arch-mips/usr/include/linux/net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h b/9/platforms/android-21/arch-mips/usr/include/linux/net_dropmon.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/net_dropmon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h b/9/platforms/android-21/arch-mips/usr/include/linux/net_tstamp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/net_tstamp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h b/9/platforms/android-21/arch-mips/usr/include/linux/netconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h b/9/platforms/android-21/arch-mips/usr/include/linux/netdevice.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netdevice.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nf_tables_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/nfnetlink_queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/x_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/x_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_AUDIT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CONNMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_CT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_DSCP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_DSCP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_HMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_HMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_LED.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_LED.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_MARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_MARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_NFLOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_RATEEST.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_SECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TCPMSS.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TEE.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TEE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_TPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_addrtype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_addrtype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_bpf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_bpf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_cgroup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_cgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_cluster.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_cluster.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_comment.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_comment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connbytes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connbytes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connlabel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connlimit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connmark.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_connmark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_conntrack.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_cpu.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_cpu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_dccp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_devgroup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_devgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_dscp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_dscp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_ecn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_esp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_esp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_hashlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_helper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_helper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_ipcomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_iprange.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_iprange.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_ipvs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_ipvs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_l2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_length.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_length.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_limit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_mac.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_mac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_mark.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_mark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_multiport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_multiport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_nfacct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_nfacct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_osf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_osf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_owner.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_owner.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_physdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_physdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_pkttype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_policy.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_policy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_quota.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_rateest.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_rateest.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_realm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_realm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_recent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_recent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_rpfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_set.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_state.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_state.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_statistic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_statistic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_tcpmss.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_tcpudp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_u32.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter/xt_u32.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_arp/arp_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_among.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_bridge/ebtables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_decnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_decnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h b/9/platforms/android-21/arch-mips/usr/include/linux/netlink_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netlink_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h b/9/platforms/android-21/arch-mips/usr/include/linux/netrom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/netrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs4_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs4_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs_idmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs_idmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfs_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfsacl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfsacl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfsd/cld.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfsd/cld.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfsd/debug.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfsd/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfsd/export.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfsd/export.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfsd/nfsfh.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfsd/nfsfh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h b/9/platforms/android-21/arch-mips/usr/include/linux/nfsd/stats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nfsd/stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h b/9/platforms/android-21/arch-mips/usr/include/linux/nl80211.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nl80211.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h b/9/platforms/android-21/arch-mips/usr/include/linux/nubus.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nubus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h b/9/platforms/android-21/arch-mips/usr/include/linux/nvme.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nvme.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h b/9/platforms/android-21/arch-mips/usr/include/linux/nvram.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/nvram.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h b/9/platforms/android-21/arch-mips/usr/include/linux/omap3isp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/omap3isp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h b/9/platforms/android-21/arch-mips/usr/include/linux/omapfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/omapfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/oom.h b/9/platforms/android-21/arch-mips/usr/include/linux/oom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/oom.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/oom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h b/9/platforms/android-21/arch-mips/usr/include/linux/openvswitch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/openvswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h b/9/platforms/android-21/arch-mips/usr/include/linux/packet_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/packet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/param.h b/9/platforms/android-21/arch-mips/usr/include/linux/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/param.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/parport.h b/9/platforms/android-21/arch-mips/usr/include/linux/parport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/parport.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/parport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h b/9/platforms/android-21/arch-mips/usr/include/linux/patchkey.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/patchkey.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci.h b/9/platforms/android-21/arch-mips/usr/include/linux/pci.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pci.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h b/9/platforms/android-21/arch-mips/usr/include/linux/pci_regs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pci_regs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h b/9/platforms/android-21/arch-mips/usr/include/linux/perf_event.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/perf_event.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/personality.h b/9/platforms/android-21/arch-mips/usr/include/linux/personality.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/personality.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h b/9/platforms/android-21/arch-mips/usr/include/linux/pfkeyv2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pfkeyv2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pg.h b/9/platforms/android-21/arch-mips/usr/include/linux/pg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h b/9/platforms/android-21/arch-mips/usr/include/linux/phantom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/phantom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h b/9/platforms/android-21/arch-mips/usr/include/linux/phonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h b/9/platforms/android-21/arch-mips/usr/include/linux/pkt_cls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pkt_cls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h b/9/platforms/android-21/arch-mips/usr/include/linux/pkt_sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pkt_sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h b/9/platforms/android-21/arch-mips/usr/include/linux/pktcdvd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pktcdvd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h b/9/platforms/android-21/arch-mips/usr/include/linux/pmu.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pmu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/poll.h b/9/platforms/android-21/arch-mips/usr/include/linux/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/poll.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h b/9/platforms/android-21/arch-mips/usr/include/linux/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h b/9/platforms/android-21/arch-mips/usr/include/linux/ppdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ppdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h b/9/platforms/android-21/arch-mips/usr/include/linux/ppp-comp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ppp-comp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/ppp-ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ppp-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h b/9/platforms/android-21/arch-mips/usr/include/linux/ppp_defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ppp_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pps.h b/9/platforms/android-21/arch-mips/usr/include/linux/pps.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pps.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/pps.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h b/9/platforms/android-21/arch-mips/usr/include/linux/ptp_clock.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ptp_clock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h b/9/platforms/android-21/arch-mips/usr/include/linux/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/qnx4_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/qnx4_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h b/9/platforms/android-21/arch-mips/usr/include/linux/qnxtypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/qnxtypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/quota.h b/9/platforms/android-21/arch-mips/usr/include/linux/quota.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/quota.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h b/9/platforms/android-21/arch-mips/usr/include/linux/radeonfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/radeonfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h b/9/platforms/android-21/arch-mips/usr/include/linux/raid/md_p.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/raid/md_p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h b/9/platforms/android-21/arch-mips/usr/include/linux/raid/md_u.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/raid/md_u.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/random.h b/9/platforms/android-21/arch-mips/usr/include/linux/random.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/random.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/random.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raw.h b/9/platforms/android-21/arch-mips/usr/include/linux/raw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raw.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rds.h b/9/platforms/android-21/arch-mips/usr/include/linux/rds.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rds.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/rds.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h b/9/platforms/android-21/arch-mips/usr/include/linux/reboot.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/reiserfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/reiserfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h b/9/platforms/android-21/arch-mips/usr/include/linux/reiserfs_xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/reiserfs_xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/resource.h b/9/platforms/android-21/arch-mips/usr/include/linux/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/resource.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h b/9/platforms/android-21/arch-mips/usr/include/linux/rfkill.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/rfkill.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/romfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/romfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rose.h b/9/platforms/android-21/arch-mips/usr/include/linux/rose.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rose.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/rose.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/route.h b/9/platforms/android-21/arch-mips/usr/include/linux/route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/route.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h b/9/platforms/android-21/arch-mips/usr/include/linux/rtc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/rtc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/rtnetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/rtnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/scc.h b/9/platforms/android-21/arch-mips/usr/include/linux/scc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/scc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/scc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sched.h b/9/platforms/android-21/arch-mips/usr/include/linux/sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sched.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h b/9/platforms/android-21/arch-mips/usr/include/linux/screen_info.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/screen_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h b/9/platforms/android-21/arch-mips/usr/include/linux/sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h b/9/platforms/android-21/arch-mips/usr/include/linux/sdla.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sdla.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h b/9/platforms/android-21/arch-mips/usr/include/linux/seccomp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/seccomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h b/9/platforms/android-21/arch-mips/usr/include/linux/securebits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/securebits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h b/9/platforms/android-21/arch-mips/usr/include/linux/selinux_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/selinux_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sem.h b/9/platforms/android-21/arch-mips/usr/include/linux/sem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sem.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial.h b/9/platforms/android-21/arch-mips/usr/include/linux/serial.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/serial.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h b/9/platforms/android-21/arch-mips/usr/include/linux/serial_core.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/serial_core.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h b/9/platforms/android-21/arch-mips/usr/include/linux/serial_reg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/serial_reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serio.h b/9/platforms/android-21/arch-mips/usr/include/linux/serio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/serio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/shm.h b/9/platforms/android-21/arch-mips/usr/include/linux/shm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/shm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signal.h b/9/platforms/android-21/arch-mips/usr/include/linux/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/signal.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h b/9/platforms/android-21/arch-mips/usr/include/linux/signalfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h b/9/platforms/android-21/arch-mips/usr/include/linux/snmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/snmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h b/9/platforms/android-21/arch-mips/usr/include/linux/sock_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sock_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/socket.h b/9/platforms/android-21/arch-mips/usr/include/linux/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/socket.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h b/9/platforms/android-21/arch-mips/usr/include/linux/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/som.h b/9/platforms/android-21/arch-mips/usr/include/linux/som.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/som.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/som.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h b/9/platforms/android-21/arch-mips/usr/include/linux/sonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h b/9/platforms/android-21/arch-mips/usr/include/linux/sonypi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sonypi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sound.h b/9/platforms/android-21/arch-mips/usr/include/linux/sound.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sound.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h b/9/platforms/android-21/arch-mips/usr/include/linux/soundcard.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/soundcard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h b/9/platforms/android-21/arch-mips/usr/include/linux/spi/spidev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/spi/spidev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stat.h b/9/platforms/android-21/arch-mips/usr/include/linux/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/stat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h b/9/platforms/android-21/arch-mips/usr/include/linux/stddef.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/stddef.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/string.h b/9/platforms/android-21/arch-mips/usr/include/linux/string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/string.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h b/9/platforms/android-21/arch-mips/usr/include/linux/sunrpc/debug.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sunrpc/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h b/9/platforms/android-21/arch-mips/usr/include/linux/suspend_ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/suspend_ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h b/9/platforms/android-21/arch-mips/usr/include/linux/sw_sync.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sw_sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/swab.h b/9/platforms/android-21/arch-mips/usr/include/linux/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/swab.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sync.h b/9/platforms/android-21/arch-mips/usr/include/linux/sync.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sync.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h b/9/platforms/android-21/arch-mips/usr/include/linux/synclink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/synclink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h b/9/platforms/android-21/arch-mips/usr/include/linux/sysctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sysctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h b/9/platforms/android-21/arch-mips/usr/include/linux/sysinfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h b/9/platforms/android-21/arch-mips/usr/include/linux/taskstats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/taskstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_csum.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_csum.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_defact.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_defact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_gact.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_gact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_ipt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_ipt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_mirred.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_mirred.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_pedit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_pedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_skbedit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_act/tc_skbedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_meta.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h b/9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tc_ematch/tc_em_text.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h b/9/platforms/android-21/arch-mips/usr/include/linux/tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h b/9/platforms/android-21/arch-mips/usr/include/linux/tcp_metrics.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tcp_metrics.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h b/9/platforms/android-21/arch-mips/usr/include/linux/telephony.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/telephony.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/termios.h b/9/platforms/android-21/arch-mips/usr/include/linux/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/termios.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/time.h b/9/platforms/android-21/arch-mips/usr/include/linux/time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/time.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/times.h b/9/platforms/android-21/arch-mips/usr/include/linux/times.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/times.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/timex.h b/9/platforms/android-21/arch-mips/usr/include/linux/timex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/timex.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h b/9/platforms/android-21/arch-mips/usr/include/linux/tiocl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tiocl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h b/9/platforms/android-21/arch-mips/usr/include/linux/tipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h b/9/platforms/android-21/arch-mips/usr/include/linux/tipc_config.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tipc_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h b/9/platforms/android-21/arch-mips/usr/include/linux/toshiba.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/toshiba.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty.h b/9/platforms/android-21/arch-mips/usr/include/linux/tty.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tty.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h b/9/platforms/android-21/arch-mips/usr/include/linux/tty_flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/tty_flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/types.h b/9/platforms/android-21/arch-mips/usr/include/linux/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/types.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h b/9/platforms/android-21/arch-mips/usr/include/linux/udf_fs_i.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/udf_fs_i.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udp.h b/9/platforms/android-21/arch-mips/usr/include/linux/udp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/udp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h b/9/platforms/android-21/arch-mips/usr/include/linux/uhid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/uhid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h b/9/platforms/android-21/arch-mips/usr/include/linux/uinput.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/uinput.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uio.h b/9/platforms/android-21/arch-mips/usr/include/linux/uio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h b/9/platforms/android-21/arch-mips/usr/include/linux/ultrasound.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/ultrasound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/un.h b/9/platforms/android-21/arch-mips/usr/include/linux/un.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/un.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h b/9/platforms/android-21/arch-mips/usr/include/linux/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h b/9/platforms/android-21/arch-mips/usr/include/linux/unix_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/unix_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/audio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/cdc-wdm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/cdc-wdm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/cdc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/cdc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/ch11.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/ch11.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/ch9.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/ch9.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/f_accessory.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/f_accessory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/f_mtp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/f_mtp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/functionfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/functionfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/g_printer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/g_printer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/gadgetfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/gadgetfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/midi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/midi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/tmc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/tmc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h b/9/platforms/android-21/arch-mips/usr/include/linux/usb/video.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h b/9/platforms/android-21/arch-mips/usr/include/linux/usbdevice_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/usbdevice_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utime.h b/9/platforms/android-21/arch-mips/usr/include/linux/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/utime.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h b/9/platforms/android-21/arch-mips/usr/include/linux/utsname.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h b/9/platforms/android-21/arch-mips/usr/include/linux/uuid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/uuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h b/9/platforms/android-21/arch-mips/usr/include/linux/uvcvideo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/uvcvideo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h b/9/platforms/android-21/arch-mips/usr/include/linux/v4l2-common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/v4l2-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h b/9/platforms/android-21/arch-mips/usr/include/linux/v4l2-controls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/v4l2-controls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h b/9/platforms/android-21/arch-mips/usr/include/linux/v4l2-dv-timings.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/v4l2-dv-timings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h b/9/platforms/android-21/arch-mips/usr/include/linux/v4l2-mediabus.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/v4l2-mediabus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h b/9/platforms/android-21/arch-mips/usr/include/linux/v4l2-subdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/v4l2-subdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/version.h b/9/platforms/android-21/arch-mips/usr/include/linux/version.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/version.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/veth.h b/9/platforms/android-21/arch-mips/usr/include/linux/veth.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/veth.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/veth.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h b/9/platforms/android-21/arch-mips/usr/include/linux/vfio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/vfio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h b/9/platforms/android-21/arch-mips/usr/include/linux/vhost.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/vhost.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h b/9/platforms/android-21/arch-mips/usr/include/linux/videodev2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/videodev2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_9p.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_9p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_balloon.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_balloon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_blk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_blk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_config.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_console.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_console.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_ids.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_pci.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_ring.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_ring.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h b/9/platforms/android-21/arch-mips/usr/include/linux/virtio_rng.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/virtio_rng.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h b/9/platforms/android-21/arch-mips/usr/include/linux/vm_sockets.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/vm_sockets.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h b/9/platforms/android-21/arch-mips/usr/include/linux/vsp1.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/vsp1.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vt.h b/9/platforms/android-21/arch-mips/usr/include/linux/vt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vt.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wait.h b/9/platforms/android-21/arch-mips/usr/include/linux/wait.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wait.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h b/9/platforms/android-21/arch-mips/usr/include/linux/wanrouter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/wanrouter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h b/9/platforms/android-21/arch-mips/usr/include/linux/watchdog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/watchdog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h b/9/platforms/android-21/arch-mips/usr/include/linux/wimax.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/wimax.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h b/9/platforms/android-21/arch-mips/usr/include/linux/wimax/i2400m.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/wimax/i2400m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h b/9/platforms/android-21/arch-mips/usr/include/linux/wireless.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/wireless.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/x25.h b/9/platforms/android-21/arch-mips/usr/include/linux/x25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/x25.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h b/9/platforms/android-21/arch-mips/usr/include/linux/xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h b/9/platforms/android-21/arch-mips/usr/include/linux/xfrm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/xfrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h b/9/platforms/android-21/arch-mips/usr/include/linux/zorro.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/zorro.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h b/9/platforms/android-21/arch-mips/usr/include/linux/zorro_ids.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h
copy to 9/platforms/android-21/arch-mips/usr/include/linux/zorro_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/locale.h b/9/platforms/android-21/arch-mips/usr/include/locale.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/locale.h
copy to 9/platforms/android-21/arch-mips/usr/include/locale.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/asm.h b/9/platforms/android-21/arch-mips/usr/include/machine/asm.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/asm.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/asm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/elf_machdep.h b/9/platforms/android-21/arch-mips/usr/include/machine/elf_machdep.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/elf_machdep.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/elf_machdep.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/endian.h b/9/platforms/android-21/arch-mips/usr/include/machine/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/endian.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/endian.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/exec.h b/9/platforms/android-21/arch-mips/usr/include/machine/exec.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/exec.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/exec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/fenv.h b/9/platforms/android-21/arch-mips/usr/include/machine/fenv.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/fenv.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/fenv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h b/9/platforms/android-21/arch-mips/usr/include/machine/ieee.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/ieee.h
diff --git a/9/platforms/android-21/arch-mips/usr/include/machine/regdef.h b/9/platforms/android-21/arch-mips/usr/include/machine/regdef.h
new file mode 100644
index 0000000..ae18392
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/include/machine/regdef.h
@@ -0,0 +1,92 @@
+/*	$OpenBSD: regdef.h,v 1.3 2005/08/07 07:29:44 miod Exp $	*/
+
+/*
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell. This file is derived from the MIPS RISC
+ * Architecture book by Gerry Kane.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)regdef.h	8.1 (Berkeley) 6/10/93
+ */
+#ifndef _MIPS_REGDEF_H_
+#define _MIPS_REGDEF_H_
+
+#define zero	$0	/* always zero */
+#define AT	$at	/* assembler temp */
+#define v0	$2	/* return value */
+#define v1	$3
+#define a0	$4	/* argument registers */
+#define a1	$5
+#define a2	$6
+#define a3	$7
+#if defined(__mips_n32) || defined(__mips_n64)
+#define a4	$8	/* expanded register arguments */
+#define a5	$9
+#define a6	$10
+#define a7	$11
+#define ta0	$8	/* alias */
+#define ta1	$9
+#define ta2	$10
+#define ta3	$11
+#define t0	$12	/* temp registers (not saved across subroutine calls) */
+#define t1	$13
+#define t2	$14
+#define t3	$15
+#else
+#define t0	$8	/* temp registers (not saved across subroutine calls) */
+#define t1	$9
+#define t2	$10
+#define t3	$11
+#define t4	$12
+#define t5	$13
+#define t6	$14
+#define t7	$15
+#define ta0	$12	/* alias */
+#define ta1	$13
+#define ta2	$14
+#define ta3	$15
+#endif
+#define s0	$16	/* saved across subroutine calls (callee saved) */
+#define s1	$17
+#define s2	$18
+#define s3	$19
+#define s4	$20
+#define s5	$21
+#define s6	$22
+#define s7	$23
+#define t8	$24	/* two more temp registers */
+#define t9	$25
+#define k0	$26	/* kernel temporary */
+#define k1	$27
+#define gp	$28	/* global pointer */
+#define sp	$29	/* stack pointer */
+#define s8	$30	/* one more callee saved */
+#define ra	$31	/* return address */
+
+#endif /* !_MIPS_REGDEF_H_ */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/regnum.h b/9/platforms/android-21/arch-mips/usr/include/machine/regnum.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/regnum.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/regnum.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/setjmp.h b/9/platforms/android-21/arch-mips/usr/include/machine/setjmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/setjmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/setjmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/signal.h b/9/platforms/android-21/arch-mips/usr/include/machine/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-mips64/usr/include/machine/signal.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h b/9/platforms/android-21/arch-mips/usr/include/machine/wchar_limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h
copy to 9/platforms/android-21/arch-mips/usr/include/machine/wchar_limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/malloc.h b/9/platforms/android-21/arch-mips/usr/include/malloc.h
similarity index 85%
copy from 9/platforms/android-19/arch-arm64/usr/include/malloc.h
copy to 9/platforms/android-21/arch-mips/usr/include/malloc.h
index 1e92b7d..e6ea276 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/malloc.h
+++ b/9/platforms/android-21/arch-mips/usr/include/malloc.h
@@ -27,19 +27,12 @@
 
 __BEGIN_DECLS
 
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
 extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
 extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
 extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
 extern void free(void* p);
+
+extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
 #ifndef STRUCT_MALLINFO_DECLARED
diff --git a/9/platforms/android-19/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-mips/usr/include/math.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/math.h
copy to 9/platforms/android-21/arch-mips/usr/include/math.h
index 8369d6e..e872388 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-mips/usr/include/math.h
@@ -512,7 +512,8 @@
 double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
 double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
 int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
+/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
 int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaCodec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaCodec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaCrypto.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaCrypto.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaDrm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaDrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaError.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaError.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaExtractor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaExtractor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaFormat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaFormat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h b/9/platforms/android-21/arch-mips/usr/include/media/NdkMediaMuxer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h
copy to 9/platforms/android-21/arch-mips/usr/include/media/NdkMediaMuxer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/memory.h b/9/platforms/android-21/arch-mips/usr/include/memory.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/memory.h
copy to 9/platforms/android-21/arch-mips/usr/include/memory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/mntent.h b/9/platforms/android-21/arch-mips/usr/include/mntent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/mntent.h
copy to 9/platforms/android-21/arch-mips/usr/include/mntent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h b/9/platforms/android-21/arch-mips/usr/include/net/ethernet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/ethernet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h b/9/platforms/android-21/arch-mips/usr/include/net/ethertypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/ethertypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if.h b/9/platforms/android-21/arch-mips/usr/include/net/if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h b/9/platforms/android-21/arch-mips/usr/include/net/if_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h b/9/platforms/android-21/arch-mips/usr/include/net/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h b/9/platforms/android-21/arch-mips/usr/include/net/if_ieee1394.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/if_ieee1394.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h b/9/platforms/android-21/arch-mips/usr/include/net/if_packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_types.h b/9/platforms/android-21/arch-mips/usr/include/net/if_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_types.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/if_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/route.h b/9/platforms/android-21/arch-mips/usr/include/net/route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/route.h
copy to 9/platforms/android-21/arch-mips/usr/include/net/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netdb.h b/9/platforms/android-21/arch-mips/usr/include/netdb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netdb.h
copy to 9/platforms/android-21/arch-mips/usr/include/netdb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h b/9/platforms/android-21/arch-mips/usr/include/netinet/ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h b/9/platforms/android-21/arch-mips/usr/include/netinet/icmp6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/icmp6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h b/9/platforms/android-21/arch-mips/usr/include/netinet/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in.h b/9/platforms/android-21/arch-mips/usr/include/netinet/in.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h b/9/platforms/android-21/arch-mips/usr/include/netinet/in6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h b/9/platforms/android-21/arch-mips/usr/include/netinet/in_systm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/in_systm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h b/9/platforms/android-21/arch-mips/usr/include/netinet/ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h b/9/platforms/android-21/arch-mips/usr/include/netinet/ip6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h b/9/platforms/android-21/arch-mips/usr/include/netinet/ip_icmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/ip_icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h b/9/platforms/android-21/arch-mips/usr/include/netinet/tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h b/9/platforms/android-21/arch-mips/usr/include/netinet/udp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h
copy to 9/platforms/android-21/arch-mips/usr/include/netinet/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h b/9/platforms/android-21/arch-mips/usr/include/netpacket/packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h
copy to 9/platforms/android-21/arch-mips/usr/include/netpacket/packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h b/9/platforms/android-21/arch-mips/usr/include/nsswitch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
copy to 9/platforms/android-21/arch-mips/usr/include/nsswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pathconf.h b/9/platforms/android-21/arch-mips/usr/include/pathconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pathconf.h
copy to 9/platforms/android-21/arch-mips/usr/include/pathconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/paths.h b/9/platforms/android-21/arch-mips/usr/include/paths.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/paths.h
copy to 9/platforms/android-21/arch-mips/usr/include/paths.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/poll.h b/9/platforms/android-21/arch-mips/usr/include/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/poll.h
copy to 9/platforms/android-21/arch-mips/usr/include/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pthread.h b/9/platforms/android-21/arch-mips/usr/include/pthread.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pthread.h
copy to 9/platforms/android-21/arch-mips/usr/include/pthread.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pwd.h b/9/platforms/android-21/arch-mips/usr/include/pwd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pwd.h
copy to 9/platforms/android-21/arch-mips/usr/include/pwd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/regex.h b/9/platforms/android-21/arch-mips/usr/include/regex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/regex.h
copy to 9/platforms/android-21/arch-mips/usr/include/regex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/resolv.h b/9/platforms/android-21/arch-mips/usr/include/resolv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/resolv.h
copy to 9/platforms/android-21/arch-mips/usr/include/resolv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sched.h b/9/platforms/android-21/arch-mips/usr/include/sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sched.h
copy to 9/platforms/android-21/arch-mips/usr/include/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/search.h b/9/platforms/android-21/arch-mips/usr/include/search.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/search.h
copy to 9/platforms/android-21/arch-mips/usr/include/search.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/semaphore.h b/9/platforms/android-21/arch-mips/usr/include/semaphore.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/semaphore.h
copy to 9/platforms/android-21/arch-mips/usr/include/semaphore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/setjmp.h b/9/platforms/android-21/arch-mips/usr/include/setjmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/setjmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/setjmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgidefs.h b/9/platforms/android-21/arch-mips/usr/include/sgidefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sgidefs.h
copy to 9/platforms/android-21/arch-mips/usr/include/sgidefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgtty.h b/9/platforms/android-21/arch-mips/usr/include/sgtty.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sgtty.h
copy to 9/platforms/android-21/arch-mips/usr/include/sgtty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/signal.h b/9/platforms/android-21/arch-mips/usr/include/signal.h
similarity index 98%
copy from 9/platforms/android-19/arch-arm64/usr/include/signal.h
copy to 9/platforms/android-21/arch-mips/usr/include/signal.h
index f1849c5..e23e65b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/signal.h
+++ b/9/platforms/android-21/arch-mips/usr/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
copy to 9/platforms/android-21/arch-mips/usr/include/stdatomic.h
index 3db25a7..58cb1bc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-mips/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
@@ -89,6 +89,7 @@
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_consume;
+using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdint.h b/9/platforms/android-21/arch-mips/usr/include/stdint.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdint.h
copy to 9/platforms/android-21/arch-mips/usr/include/stdint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdio.h b/9/platforms/android-21/arch-mips/usr/include/stdio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdio.h
copy to 9/platforms/android-21/arch-mips/usr/include/stdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-21/arch-mips/usr/include/stdlib.h
similarity index 96%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdlib.h
copy to 9/platforms/android-21/arch-mips/usr/include/stdlib.h
index a0f017c..e04475c 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h
+++ b/9/platforms/android-21/arch-mips/usr/include/stdlib.h
@@ -76,8 +76,8 @@
 extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
 
 extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
+extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
+extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
 
 extern int atoi(const char*) __purefunc;
 extern long atol(const char*) __purefunc;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/string.h b/9/platforms/android-21/arch-mips/usr/include/string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/string.h
copy to 9/platforms/android-21/arch-mips/usr/include/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/strings.h b/9/platforms/android-21/arch-mips/usr/include/strings.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/strings.h
copy to 9/platforms/android-21/arch-mips/usr/include/strings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h b/9/platforms/android-21/arch-mips/usr/include/sys/auxv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/auxv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h b/9/platforms/android-21/arch-mips/usr/include/sys/cachectl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/cachectl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/capability.h b/9/platforms/android-21/arch-mips/usr/include/sys/capability.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/capability.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h b/9/platforms/android-21/arch-mips/usr/include/sys/cdefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/cdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h b/9/platforms/android-21/arch-mips/usr/include/sys/cdefs_elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/cdefs_elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h b/9/platforms/android-21/arch-mips/usr/include/sys/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h b/9/platforms/android-21/arch-mips/usr/include/sys/epoll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/epoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/errno.h b/9/platforms/android-21/arch-mips/usr/include/sys/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/errno.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h b/9/platforms/android-21/arch-mips/usr/include/sys/eventfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/eventfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/file.h b/9/platforms/android-21/arch-mips/usr/include/sys/file.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/file.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/file.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h b/9/platforms/android-21/arch-mips/usr/include/sys/fsuid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/fsuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h b/9/platforms/android-21/arch-mips/usr/include/sys/glibc-syscalls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/glibc-syscalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h b/9/platforms/android-21/arch-mips/usr/include/sys/inotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h b/9/platforms/android-21/arch-mips/usr/include/sys/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h b/9/platforms/android-21/arch-mips/usr/include/sys/ioctl_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ioctl_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h b/9/platforms/android-21/arch-mips/usr/include/sys/ipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/klog.h b/9/platforms/android-21/arch-mips/usr/include/sys/klog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/klog.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/klog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/limits.h b/9/platforms/android-21/arch-mips/usr/include/sys/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/limits.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mman.h b/9/platforms/android-21/arch-mips/usr/include/sys/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/mman.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mount.h b/9/platforms/android-21/arch-mips/usr/include/sys/mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/mount.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/msg.h b/9/platforms/android-21/arch-mips/usr/include/sys/msg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/msg.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/param.h b/9/platforms/android-21/arch-mips/usr/include/sys/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/param.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/personality.h b/9/platforms/android-21/arch-mips/usr/include/sys/personality.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/personality.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/poll.h b/9/platforms/android-21/arch-mips/usr/include/sys/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/poll.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h b/9/platforms/android-21/arch-mips/usr/include/sys/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h b/9/platforms/android-21/arch-mips/usr/include/sys/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/queue.h b/9/platforms/android-21/arch-mips/usr/include/sys/queue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/queue.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h b/9/platforms/android-21/arch-mips/usr/include/sys/reboot.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reg.h b/9/platforms/android-21/arch-mips/usr/include/sys/reg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/reg.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/resource.h b/9/platforms/android-21/arch-mips/usr/include/sys/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/resource.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/select.h b/9/platforms/android-21/arch-mips/usr/include/sys/select.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/select.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/select.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sem.h b/9/platforms/android-21/arch-mips/usr/include/sys/sem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sem.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h b/9/platforms/android-21/arch-mips/usr/include/sys/sendfile.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/sendfile.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/shm.h b/9/platforms/android-21/arch-mips/usr/include/sys/shm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/shm.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signal.h b/9/platforms/android-21/arch-mips/usr/include/sys/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/signal.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h b/9/platforms/android-21/arch-mips/usr/include/sys/signalfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socket.h b/9/platforms/android-21/arch-mips/usr/include/sys/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/socket.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h b/9/platforms/android-21/arch-mips/usr/include/sys/socketcalls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/socketcalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h b/9/platforms/android-21/arch-mips/usr/include/sys/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h b/9/platforms/android-21/arch-mips/usr/include/sys/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h b/9/platforms/android-21/arch-mips/usr/include/sys/statvfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/statvfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/swap.h b/9/platforms/android-21/arch-mips/usr/include/sys/swap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/swap.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/swap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h b/9/platforms/android-21/arch-mips/usr/include/sys/syscall.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/syscall.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h b/9/platforms/android-21/arch-mips/usr/include/sys/sysconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/sysconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h b/9/platforms/android-21/arch-mips/usr/include/sys/sysinfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h b/9/platforms/android-21/arch-mips/usr/include/sys/syslimits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/syslimits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h b/9/platforms/android-21/arch-mips/usr/include/sys/sysmacros.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/sysmacros.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h b/9/platforms/android-21/arch-mips/usr/include/sys/system_properties.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/system_properties.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/time.h b/9/platforms/android-21/arch-mips/usr/include/sys/time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/time.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h b/9/platforms/android-21/arch-mips/usr/include/sys/timerfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/timerfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/times.h b/9/platforms/android-21/arch-mips/usr/include/sys/times.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/times.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timex.h b/9/platforms/android-21/arch-mips/usr/include/sys/timex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/timex.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h b/9/platforms/android-21/arch-mips/usr/include/sys/ttychars.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ttychars.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h b/9/platforms/android-21/arch-mips/usr/include/sys/ttydefaults.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ttydefaults.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h b/9/platforms/android-21/arch-mips/usr/include/sys/ttydev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ttydev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/types.h b/9/platforms/android-21/arch-mips/usr/include/sys/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/types.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-mips/usr/include/sys/ucontext.h
similarity index 95%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/ucontext.h
index f62380d..dd2a0bb 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-21/arch-mips/usr/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -80,6 +78,10 @@
 
 #elif defined(__aarch64__)
 
+#define NGREG 34 /* x0..x30 + sp + pc + pstate */
+typedef unsigned long greg_t;
+typedef greg_t gregset_t[NGREG];
+
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -152,11 +154,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/uio.h b/9/platforms/android-21/arch-mips/usr/include/sys/uio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/uio.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/un.h b/9/platforms/android-21/arch-mips/usr/include/sys/un.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/un.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/user.h b/9/platforms/android-21/arch-mips/usr/include/sys/user.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/user.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/user.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utime.h b/9/platforms/android-21/arch-mips/usr/include/sys/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/utime.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h b/9/platforms/android-21/arch-mips/usr/include/sys/utsname.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h b/9/platforms/android-21/arch-mips/usr/include/sys/vfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/vfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vt.h b/9/platforms/android-21/arch-mips/usr/include/sys/vt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/vt.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/wait.h b/9/platforms/android-21/arch-mips/usr/include/sys/wait.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/wait.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h b/9/platforms/android-21/arch-mips/usr/include/sys/xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h
copy to 9/platforms/android-21/arch-mips/usr/include/sys/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/syslog.h b/9/platforms/android-21/arch-mips/usr/include/syslog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/syslog.h
copy to 9/platforms/android-21/arch-mips/usr/include/syslog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termio.h b/9/platforms/android-21/arch-mips/usr/include/termio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/termio.h
copy to 9/platforms/android-21/arch-mips/usr/include/termio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termios.h b/9/platforms/android-21/arch-mips/usr/include/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/termios.h
copy to 9/platforms/android-21/arch-mips/usr/include/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/thread_db.h b/9/platforms/android-21/arch-mips/usr/include/thread_db.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/thread_db.h
copy to 9/platforms/android-21/arch-mips/usr/include/thread_db.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time.h b/9/platforms/android-21/arch-mips/usr/include/time.h
similarity index 91%
copy from 9/platforms/android-19/arch-arm64/usr/include/time.h
copy to 9/platforms/android-21/arch-mips/usr/include/time.h
index 0a5f18b..aa72fcc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/time.h
+++ b/9/platforms/android-21/arch-mips/usr/include/time.h
@@ -85,8 +85,10 @@
 
 extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
 
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__;
 
 extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
 extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time64.h b/9/platforms/android-21/arch-mips/usr/include/time64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/time64.h
copy to 9/platforms/android-21/arch-mips/usr/include/time64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/uchar.h b/9/platforms/android-21/arch-mips/usr/include/uchar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/uchar.h
copy to 9/platforms/android-21/arch-mips/usr/include/uchar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ucontext.h b/9/platforms/android-21/arch-mips/usr/include/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ucontext.h
copy to 9/platforms/android-21/arch-mips/usr/include/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/unistd.h b/9/platforms/android-21/arch-mips/usr/include/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/unistd.h
copy to 9/platforms/android-21/arch-mips/usr/include/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/util.h b/9/platforms/android-21/arch-mips/usr/include/util.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/util.h
copy to 9/platforms/android-21/arch-mips/usr/include/util.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utime.h b/9/platforms/android-21/arch-mips/usr/include/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/utime.h
copy to 9/platforms/android-21/arch-mips/usr/include/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utmp.h b/9/platforms/android-21/arch-mips/usr/include/utmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/utmp.h
copy to 9/platforms/android-21/arch-mips/usr/include/utmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-21/arch-mips/usr/include/wchar.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/wchar.h
copy to 9/platforms/android-21/arch-mips/usr/include/wchar.h
index f421d4c..cfa9b74 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-21/arch-mips/usr/include/wchar.h
@@ -151,8 +151,8 @@
 extern int               wprintf(const wchar_t *, ...);
 extern int               wscanf(const wchar_t *, ...);
 
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
+extern long long          wcstoll_l(const wchar_t *, wchar_t **, int, locale_t);
+extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t);
 extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
 
 extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wctype.h b/9/platforms/android-21/arch-mips/usr/include/wctype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/wctype.h
copy to 9/platforms/android-21/arch-mips/usr/include/wctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/xlocale.h b/9/platforms/android-21/arch-mips/usr/include/xlocale.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/xlocale.h
copy to 9/platforms/android-21/arch-mips/usr/include/xlocale.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zconf.h b/9/platforms/android-21/arch-mips/usr/include/zconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/zconf.h
copy to 9/platforms/android-21/arch-mips/usr/include/zconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zlib.h b/9/platforms/android-21/arch-mips/usr/include/zlib.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/zlib.h
copy to 9/platforms/android-21/arch-mips/usr/include/zlib.h
diff --git a/9/platforms/android-21/arch-mips/usr/lib/crtbegin_dynamic.o b/9/platforms/android-21/arch-mips/usr/lib/crtbegin_dynamic.o
new file mode 100644
index 0000000..e9b884c
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/crtbegin_so.o b/9/platforms/android-21/arch-mips/usr/lib/crtbegin_so.o
new file mode 100644
index 0000000..70fafec
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/crtbegin_static.o b/9/platforms/android-21/arch-mips/usr/lib/crtbegin_static.o
new file mode 100644
index 0000000..b31c813
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/crtend_android.o b/9/platforms/android-21/arch-mips/usr/lib/crtend_android.o
new file mode 100644
index 0000000..4d98eb9
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/crtend_so.o b/9/platforms/android-21/arch-mips/usr/lib/crtend_so.o
new file mode 100644
index 0000000..6631c9a
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libEGL.so b/9/platforms/android-21/arch-mips/usr/lib/libEGL.so
new file mode 100755
index 0000000..98f59cd
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libEGL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libGLESv1_CM.so b/9/platforms/android-21/arch-mips/usr/lib/libGLESv1_CM.so
new file mode 100755
index 0000000..43f383e
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libGLESv2.so b/9/platforms/android-21/arch-mips/usr/lib/libGLESv2.so
new file mode 100755
index 0000000..0f11685
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libGLESv3.so b/9/platforms/android-21/arch-mips/usr/lib/libGLESv3.so
new file mode 100755
index 0000000..1493a83
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libOpenMAXAL.so b/9/platforms/android-21/arch-mips/usr/lib/libOpenMAXAL.so
new file mode 100755
index 0000000..2b241a5
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libOpenSLES.so b/9/platforms/android-21/arch-mips/usr/lib/libOpenSLES.so
new file mode 100755
index 0000000..4631300
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libandroid.so b/9/platforms/android-21/arch-mips/usr/lib/libandroid.so
new file mode 100755
index 0000000..3f118d7
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libandroid.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libc.a b/9/platforms/android-21/arch-mips/usr/lib/libc.a
new file mode 100644
index 0000000..ac6dcbf
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libc.so b/9/platforms/android-21/arch-mips/usr/lib/libc.so
new file mode 100755
index 0000000..6009d2d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libc.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libdl.so b/9/platforms/android-21/arch-mips/usr/lib/libdl.so
new file mode 100755
index 0000000..a12e56e
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libdl.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libjnigraphics.so b/9/platforms/android-21/arch-mips/usr/lib/libjnigraphics.so
new file mode 100755
index 0000000..23d992a
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/liblog.so b/9/platforms/android-21/arch-mips/usr/lib/liblog.so
new file mode 100755
index 0000000..340c886
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/liblog.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libm.a b/9/platforms/android-21/arch-mips/usr/lib/libm.a
new file mode 100644
index 0000000..76a4e2e
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libm.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libm.so b/9/platforms/android-21/arch-mips/usr/lib/libm.so
new file mode 100755
index 0000000..e1758a8
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libm.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libmediandk.so b/9/platforms/android-21/arch-mips/usr/lib/libmediandk.so
new file mode 100755
index 0000000..d3f28ec
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libstdc++.a b/9/platforms/android-21/arch-mips/usr/lib/libstdc++.a
new file mode 100644
index 0000000..1896a36
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libstdc++.so b/9/platforms/android-21/arch-mips/usr/lib/libstdc++.so
new file mode 100755
index 0000000..a6f8203
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libthread_db.so b/9/platforms/android-21/arch-mips/usr/lib/libthread_db.so
new file mode 100755
index 0000000..fff60a3
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libthread_db.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libz.a b/9/platforms/android-21/arch-mips/usr/lib/libz.a
new file mode 100644
index 0000000..f843e40
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libz.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/lib/libz.so b/9/platforms/android-21/arch-mips/usr/lib/libz.so
new file mode 100755
index 0000000..e58450e
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/lib/libz.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_dynamic.o b/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_dynamic.o
new file mode 100644
index 0000000..28ec545
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_so.o b/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_so.o
new file mode 100644
index 0000000..f3ca291
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_static.o b/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_static.o
new file mode 100644
index 0000000..4b9cb99
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/crtend_android.o b/9/platforms/android-21/arch-mips/usr/libr2/crtend_android.o
new file mode 100644
index 0000000..c3d14a1
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/crtend_so.o b/9/platforms/android-21/arch-mips/usr/libr2/crtend_so.o
new file mode 100644
index 0000000..4781a0b
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libEGL.so b/9/platforms/android-21/arch-mips/usr/libr2/libEGL.so
new file mode 100755
index 0000000..1f26f43
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libEGL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libGLESv1_CM.so b/9/platforms/android-21/arch-mips/usr/libr2/libGLESv1_CM.so
new file mode 100755
index 0000000..933a85d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libGLESv2.so b/9/platforms/android-21/arch-mips/usr/libr2/libGLESv2.so
new file mode 100755
index 0000000..00cc243
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libGLESv3.so b/9/platforms/android-21/arch-mips/usr/libr2/libGLESv3.so
new file mode 100755
index 0000000..96a856d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libOpenMAXAL.so b/9/platforms/android-21/arch-mips/usr/libr2/libOpenMAXAL.so
new file mode 100755
index 0000000..7377270
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libOpenSLES.so b/9/platforms/android-21/arch-mips/usr/libr2/libOpenSLES.so
new file mode 100755
index 0000000..bb82ad6
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libandroid.so b/9/platforms/android-21/arch-mips/usr/libr2/libandroid.so
new file mode 100755
index 0000000..5acb02d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libandroid.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libc.a b/9/platforms/android-21/arch-mips/usr/libr2/libc.a
new file mode 100644
index 0000000..6a85a6d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libc.so b/9/platforms/android-21/arch-mips/usr/libr2/libc.so
new file mode 100755
index 0000000..42192a2
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libc.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libdl.so b/9/platforms/android-21/arch-mips/usr/libr2/libdl.so
new file mode 100755
index 0000000..3d9fa78
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libdl.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libjnigraphics.so b/9/platforms/android-21/arch-mips/usr/libr2/libjnigraphics.so
new file mode 100755
index 0000000..4fdb878
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/liblog.so b/9/platforms/android-21/arch-mips/usr/libr2/liblog.so
new file mode 100755
index 0000000..faa6a03
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/liblog.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libm.a b/9/platforms/android-21/arch-mips/usr/libr2/libm.a
new file mode 100644
index 0000000..8faed91
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libm.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libm.so b/9/platforms/android-21/arch-mips/usr/libr2/libm.so
new file mode 100755
index 0000000..31814cf
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libm.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libmediandk.so b/9/platforms/android-21/arch-mips/usr/libr2/libmediandk.so
new file mode 100755
index 0000000..8be379f
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libstdc++.a b/9/platforms/android-21/arch-mips/usr/libr2/libstdc++.a
new file mode 100644
index 0000000..9bdce4f
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libstdc++.so b/9/platforms/android-21/arch-mips/usr/libr2/libstdc++.so
new file mode 100755
index 0000000..1eb016d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libthread_db.so b/9/platforms/android-21/arch-mips/usr/libr2/libthread_db.so
new file mode 100755
index 0000000..159b439
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libthread_db.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr2/libz.so b/9/platforms/android-21/arch-mips/usr/libr2/libz.so
new file mode 100755
index 0000000..3b1b995
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr2/libz.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_dynamic.o b/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_dynamic.o
new file mode 100644
index 0000000..7b7903f
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_so.o b/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_so.o
new file mode 100644
index 0000000..01d90be
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_static.o b/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_static.o
new file mode 100644
index 0000000..0741f31
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/crtend_android.o b/9/platforms/android-21/arch-mips/usr/libr6/crtend_android.o
new file mode 100644
index 0000000..8e1fda5
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/crtend_so.o b/9/platforms/android-21/arch-mips/usr/libr6/crtend_so.o
new file mode 100644
index 0000000..e524404
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libEGL.so b/9/platforms/android-21/arch-mips/usr/libr6/libEGL.so
new file mode 100755
index 0000000..3a57e25
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libEGL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libGLESv1_CM.so b/9/platforms/android-21/arch-mips/usr/libr6/libGLESv1_CM.so
new file mode 100755
index 0000000..4525abb
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libGLESv2.so b/9/platforms/android-21/arch-mips/usr/libr6/libGLESv2.so
new file mode 100755
index 0000000..ae571dd
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libGLESv3.so b/9/platforms/android-21/arch-mips/usr/libr6/libGLESv3.so
new file mode 100755
index 0000000..f920bca
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libOpenMAXAL.so b/9/platforms/android-21/arch-mips/usr/libr6/libOpenMAXAL.so
new file mode 100755
index 0000000..56eab67
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libOpenSLES.so b/9/platforms/android-21/arch-mips/usr/libr6/libOpenSLES.so
new file mode 100755
index 0000000..f985e99
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libandroid.so b/9/platforms/android-21/arch-mips/usr/libr6/libandroid.so
new file mode 100755
index 0000000..58f864e
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libandroid.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libc.a b/9/platforms/android-21/arch-mips/usr/libr6/libc.a
new file mode 100644
index 0000000..a4df17a
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libc.so b/9/platforms/android-21/arch-mips/usr/libr6/libc.so
new file mode 100755
index 0000000..3bd6be1
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libc.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libdl.so b/9/platforms/android-21/arch-mips/usr/libr6/libdl.so
new file mode 100755
index 0000000..c6c04f5
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libdl.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libjnigraphics.so b/9/platforms/android-21/arch-mips/usr/libr6/libjnigraphics.so
new file mode 100755
index 0000000..2a706d7
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/liblog.so b/9/platforms/android-21/arch-mips/usr/libr6/liblog.so
new file mode 100755
index 0000000..584a976
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/liblog.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libm.a b/9/platforms/android-21/arch-mips/usr/libr6/libm.a
new file mode 100644
index 0000000..c9681bd
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libm.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libm.so b/9/platforms/android-21/arch-mips/usr/libr6/libm.so
new file mode 100755
index 0000000..35cb570
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libm.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libmediandk.so b/9/platforms/android-21/arch-mips/usr/libr6/libmediandk.so
new file mode 100755
index 0000000..2f663f4
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libstdc++.a b/9/platforms/android-21/arch-mips/usr/libr6/libstdc++.a
new file mode 100644
index 0000000..a9829c8
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libstdc++.so b/9/platforms/android-21/arch-mips/usr/libr6/libstdc++.so
new file mode 100755
index 0000000..4ea1655
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libthread_db.so b/9/platforms/android-21/arch-mips/usr/libr6/libthread_db.so
new file mode 100755
index 0000000..9bf587d
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libthread_db.so
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libz.a b/9/platforms/android-21/arch-mips/usr/libr6/libz.a
new file mode 100644
index 0000000..3954936
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libz.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips/usr/libr6/libz.so b/9/platforms/android-21/arch-mips/usr/libr6/libz.so
new file mode 100755
index 0000000..fb9974a
--- /dev/null
+++ b/9/platforms/android-21/arch-mips/usr/libr6/libz.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/include/EGL/egl.h b/9/platforms/android-21/arch-mips64/usr/include/EGL/egl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/EGL/egl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/EGL/egl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/EGL/eglext.h b/9/platforms/android-21/arch-mips64/usr/include/EGL/eglext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/EGL/eglext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/EGL/eglext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/EGL/eglplatform.h b/9/platforms/android-21/arch-mips64/usr/include/EGL/eglplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/EGL/eglplatform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/EGL/eglplatform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES/gl.h b/9/platforms/android-21/arch-mips64/usr/include/GLES/gl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES/gl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES/gl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES/glext.h b/9/platforms/android-21/arch-mips64/usr/include/GLES/glext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES/glext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES/glext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES/glplatform.h b/9/platforms/android-21/arch-mips64/usr/include/GLES/glplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES/glplatform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES/glplatform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES2/gl2.h b/9/platforms/android-21/arch-mips64/usr/include/GLES2/gl2.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES2/gl2.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES2/gl2.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES2/gl2ext.h b/9/platforms/android-21/arch-mips64/usr/include/GLES2/gl2ext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES2/gl2ext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES2/gl2ext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES2/gl2platform.h b/9/platforms/android-21/arch-mips64/usr/include/GLES2/gl2platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES2/gl2platform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES2/gl2platform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES3/gl3.h b/9/platforms/android-21/arch-mips64/usr/include/GLES3/gl3.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES3/gl3.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES3/gl3.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES3/gl31.h b/9/platforms/android-21/arch-mips64/usr/include/GLES3/gl31.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES3/gl31.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES3/gl31.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES3/gl3ext.h b/9/platforms/android-21/arch-mips64/usr/include/GLES3/gl3ext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES3/gl3ext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES3/gl3ext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/GLES3/gl3platform.h b/9/platforms/android-21/arch-mips64/usr/include/GLES3/gl3platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/GLES3/gl3platform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/GLES3/gl3platform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/KHR/khrplatform.h b/9/platforms/android-21/arch-mips64/usr/include/KHR/khrplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/KHR/khrplatform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/KHR/khrplatform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/OMXAL/OpenMAXAL.h b/9/platforms/android-21/arch-mips64/usr/include/OMXAL/OpenMAXAL.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/OMXAL/OpenMAXAL.h
rename to 9/platforms/android-21/arch-mips64/usr/include/OMXAL/OpenMAXAL.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-21/arch-mips64/usr/include/OMXAL/OpenMAXAL_Android.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/OMXAL/OpenMAXAL_Android.h
rename to 9/platforms/android-21/arch-mips64/usr/include/OMXAL/OpenMAXAL_Android.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/OMXAL/OpenMAXAL_Platform.h b/9/platforms/android-21/arch-mips64/usr/include/OMXAL/OpenMAXAL_Platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/OMXAL/OpenMAXAL_Platform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/OMXAL/OpenMAXAL_Platform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES.h b/9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES.h
rename to 9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_Android.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_Android.h
rename to 9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_Android.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_AndroidConfiguration.h b/9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
rename to 9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_AndroidMetadata.h b/9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_AndroidMetadata.h
rename to 9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_Platform.h b/9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_Platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/SLES/OpenSLES_Platform.h
rename to 9/platforms/android-21/arch-mips64/usr/include/SLES/OpenSLES_Platform.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/alloca.h b/9/platforms/android-21/arch-mips64/usr/include/alloca.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/alloca.h
rename to 9/platforms/android-21/arch-mips64/usr/include/alloca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h b/9/platforms/android-21/arch-mips64/usr/include/android/api-level.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
copy to 9/platforms/android-21/arch-mips64/usr/include/android/api-level.h
index 9e9c3d6..649efd6 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/android/api-level.h
@@ -28,6 +28,6 @@
 #ifndef ANDROID_API_LEVEL_H
 #define ANDROID_API_LEVEL_H
 
-#define __ANDROID_API__ 19
+#define __ANDROID_API__ 21
 
 #endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/asset_manager.h b/9/platforms/android-21/arch-mips64/usr/include/android/asset_manager.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/asset_manager.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/asset_manager.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/asset_manager_jni.h b/9/platforms/android-21/arch-mips64/usr/include/android/asset_manager_jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/asset_manager_jni.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/asset_manager_jni.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/bitmap.h b/9/platforms/android-21/arch-mips64/usr/include/android/bitmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/bitmap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/bitmap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/configuration.h b/9/platforms/android-21/arch-mips64/usr/include/android/configuration.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/configuration.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/configuration.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/dlext.h b/9/platforms/android-21/arch-mips64/usr/include/android/dlext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/dlext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/dlext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/input.h b/9/platforms/android-21/arch-mips64/usr/include/android/input.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/input.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/input.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/keycodes.h b/9/platforms/android-21/arch-mips64/usr/include/android/keycodes.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/keycodes.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/keycodes.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/log.h b/9/platforms/android-21/arch-mips64/usr/include/android/log.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/log.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/log.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/looper.h b/9/platforms/android-21/arch-mips64/usr/include/android/looper.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/looper.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/looper.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/native_activity.h b/9/platforms/android-21/arch-mips64/usr/include/android/native_activity.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/native_activity.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/native_activity.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/native_window.h b/9/platforms/android-21/arch-mips64/usr/include/android/native_window.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/native_window.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/native_window.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/native_window_jni.h b/9/platforms/android-21/arch-mips64/usr/include/android/native_window_jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/native_window_jni.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/native_window_jni.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/obb.h b/9/platforms/android-21/arch-mips64/usr/include/android/obb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/obb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/obb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/rect.h b/9/platforms/android-21/arch-mips64/usr/include/android/rect.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/rect.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/rect.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/sensor.h b/9/platforms/android-21/arch-mips64/usr/include/android/sensor.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/sensor.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/sensor.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/storage_manager.h b/9/platforms/android-21/arch-mips64/usr/include/android/storage_manager.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/storage_manager.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/storage_manager.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/tts.h b/9/platforms/android-21/arch-mips64/usr/include/android/tts.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/tts.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/tts.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/android/window.h b/9/platforms/android-21/arch-mips64/usr/include/android/window.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/android/window.h
rename to 9/platforms/android-21/arch-mips64/usr/include/android/window.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/ar.h b/9/platforms/android-21/arch-mips64/usr/include/ar.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/ar.h
rename to 9/platforms/android-21/arch-mips64/usr/include/ar.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h b/9/platforms/android-21/arch-mips64/usr/include/arpa/inet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/arpa/inet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/arpa/inet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/arpa/nameser.h b/9/platforms/android-21/arch-mips64/usr/include/arpa/nameser.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/arpa/nameser.h
rename to 9/platforms/android-21/arch-mips64/usr/include/arpa/nameser.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/arpa/nameser_compat.h b/9/platforms/android-21/arch-mips64/usr/include/arpa/nameser_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/arpa/nameser_compat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/arpa/nameser_compat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/arpa/telnet.h b/9/platforms/android-21/arch-mips64/usr/include/arpa/telnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/arpa/telnet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/arpa/telnet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/auxvec.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/auxvec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/auxvec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/bitsperlong.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/bitsperlong.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/bitsperlong.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/bitsperlong.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/errno-base.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/errno-base.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/errno-base.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/errno-base.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/errno.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/errno.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/errno.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/fcntl.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/fcntl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/fcntl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/int-l64.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/int-l64.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/int-l64.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/int-l64.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/int-ll64.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/int-ll64.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/int-ll64.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/int-ll64.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/ioctls.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/ioctls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/ioctls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/ipcbuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/ipcbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/ipcbuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/ipcbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/kvm_para.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/kvm_para.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/kvm_para.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/mman-common.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/mman-common.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/mman-common.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/mman-common.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/mman.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/mman.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/mman.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/msgbuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/msgbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/msgbuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/msgbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/param.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/param.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/param.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/poll.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/poll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/poll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/posix_types.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/posix_types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/posix_types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/resource.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/resource.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/resource.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/sembuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/sembuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/sembuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/sembuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/setup.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/setup.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/setup.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/setup.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/shmbuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/shmbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/shmbuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/shmbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/shmparam.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/shmparam.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/shmparam.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/shmparam.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/siginfo.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/siginfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/siginfo.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/siginfo.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/signal-defs.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/signal-defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/signal-defs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/signal-defs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/signal.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/signal.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/signal.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/socket.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/socket.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/sockios.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/sockios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/sockios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/stat.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/stat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/stat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/statfs.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/statfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/statfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/swab.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/swab.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/swab.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/termbits.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/termbits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/termbits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/termbits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/termios.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/termios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/termios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/types.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/ucontext.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/ucontext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/ucontext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm-generic/unistd.h b/9/platforms/android-21/arch-mips64/usr/include/asm-generic/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm-generic/unistd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm-generic/unistd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/a.out.h b/9/platforms/android-21/arch-mips64/usr/include/asm/a.out.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/a.out.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/a.out.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/auxvec.h b/9/platforms/android-21/arch-mips64/usr/include/asm/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/auxvec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/auxvec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/bitsperlong.h b/9/platforms/android-21/arch-mips64/usr/include/asm/bitsperlong.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/bitsperlong.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/bitsperlong.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/break.h b/9/platforms/android-21/arch-mips64/usr/include/asm/break.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/break.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/break.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h b/9/platforms/android-21/arch-mips64/usr/include/asm/byteorder.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/byteorder.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/byteorder.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/cachectl.h b/9/platforms/android-21/arch-mips64/usr/include/asm/cachectl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/cachectl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/cachectl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/errno.h b/9/platforms/android-21/arch-mips64/usr/include/asm/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/errno.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/errno.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/fcntl.h b/9/platforms/android-21/arch-mips64/usr/include/asm/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/fcntl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/fcntl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/inst.h b/9/platforms/android-21/arch-mips64/usr/include/asm/inst.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/inst.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/inst.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/asm/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ioctls.h b/9/platforms/android-21/arch-mips64/usr/include/asm/ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/ioctls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/ioctls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ipcbuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm/ipcbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/ipcbuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/ipcbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/kvm.h b/9/platforms/android-21/arch-mips64/usr/include/asm/kvm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/kvm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/kvm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/kvm_para.h b/9/platforms/android-21/arch-mips64/usr/include/asm/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/kvm_para.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/kvm_para.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/mman.h b/9/platforms/android-21/arch-mips64/usr/include/asm/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/mman.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/mman.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/msgbuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm/msgbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/msgbuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/msgbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/param.h b/9/platforms/android-21/arch-mips64/usr/include/asm/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/param.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/param.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/poll.h b/9/platforms/android-21/arch-mips64/usr/include/asm/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/poll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/poll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/posix_types.h b/9/platforms/android-21/arch-mips64/usr/include/asm/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/posix_types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/posix_types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ptrace.h b/9/platforms/android-21/arch-mips64/usr/include/asm/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/ptrace.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/ptrace.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/resource.h b/9/platforms/android-21/arch-mips64/usr/include/asm/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/resource.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/resource.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sembuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm/sembuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/sembuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/sembuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/setup.h b/9/platforms/android-21/arch-mips64/usr/include/asm/setup.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/setup.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/setup.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sgidefs.h b/9/platforms/android-21/arch-mips64/usr/include/asm/sgidefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/sgidefs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/sgidefs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/shmbuf.h b/9/platforms/android-21/arch-mips64/usr/include/asm/shmbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/shmbuf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/shmbuf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sigcontext.h b/9/platforms/android-21/arch-mips64/usr/include/asm/sigcontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/sigcontext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/sigcontext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/siginfo.h b/9/platforms/android-21/arch-mips64/usr/include/asm/siginfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/siginfo.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/siginfo.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/signal.h b/9/platforms/android-21/arch-mips64/usr/include/asm/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/signal.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/signal.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/socket.h b/9/platforms/android-21/arch-mips64/usr/include/asm/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/socket.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sockios.h b/9/platforms/android-21/arch-mips64/usr/include/asm/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/sockios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/sockios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/stat.h b/9/platforms/android-21/arch-mips64/usr/include/asm/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/stat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/stat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/statfs.h b/9/platforms/android-21/arch-mips64/usr/include/asm/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/statfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/statfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/swab.h b/9/platforms/android-21/arch-mips64/usr/include/asm/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/swab.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/swab.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/sysmips.h b/9/platforms/android-21/arch-mips64/usr/include/asm/sysmips.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/sysmips.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/sysmips.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/termbits.h b/9/platforms/android-21/arch-mips64/usr/include/asm/termbits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/termbits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/termbits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/termios.h b/9/platforms/android-21/arch-mips64/usr/include/asm/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/termios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/termios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/types.h b/9/platforms/android-21/arch-mips64/usr/include/asm/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/ucontext.h b/9/platforms/android-21/arch-mips64/usr/include/asm/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/ucontext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/ucontext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/asm/unistd.h b/9/platforms/android-21/arch-mips64/usr/include/asm/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/asm/unistd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/asm/unistd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/assert.h b/9/platforms/android-21/arch-mips64/usr/include/assert.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/assert.h
rename to 9/platforms/android-21/arch-mips64/usr/include/assert.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/byteswap.h b/9/platforms/android-21/arch-mips64/usr/include/byteswap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/byteswap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/byteswap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/complex.h b/9/platforms/android-21/arch-mips64/usr/include/complex.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/complex.h
rename to 9/platforms/android-21/arch-mips64/usr/include/complex.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/ctype.h b/9/platforms/android-21/arch-mips64/usr/include/ctype.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/ctype.h
rename to 9/platforms/android-21/arch-mips64/usr/include/ctype.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/dirent.h b/9/platforms/android-21/arch-mips64/usr/include/dirent.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/dirent.h
rename to 9/platforms/android-21/arch-mips64/usr/include/dirent.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/dlfcn.h b/9/platforms/android-21/arch-mips64/usr/include/dlfcn.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/dlfcn.h
rename to 9/platforms/android-21/arch-mips64/usr/include/dlfcn.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/elf.h b/9/platforms/android-21/arch-mips64/usr/include/elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/elf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/elf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/endian.h b/9/platforms/android-21/arch-mips64/usr/include/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/endian.h
rename to 9/platforms/android-21/arch-mips64/usr/include/endian.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/err.h b/9/platforms/android-21/arch-mips64/usr/include/err.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/err.h
rename to 9/platforms/android-21/arch-mips64/usr/include/err.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/errno.h b/9/platforms/android-21/arch-mips64/usr/include/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/errno.h
rename to 9/platforms/android-21/arch-mips64/usr/include/errno.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/fcntl.h b/9/platforms/android-21/arch-mips64/usr/include/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/fcntl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/fcntl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/features.h b/9/platforms/android-21/arch-mips64/usr/include/features.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/features.h
rename to 9/platforms/android-21/arch-mips64/usr/include/features.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/fenv.h b/9/platforms/android-21/arch-mips64/usr/include/fenv.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/fenv.h
rename to 9/platforms/android-21/arch-mips64/usr/include/fenv.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/fnmatch.h b/9/platforms/android-21/arch-mips64/usr/include/fnmatch.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/fnmatch.h
rename to 9/platforms/android-21/arch-mips64/usr/include/fnmatch.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/fts.h b/9/platforms/android-21/arch-mips64/usr/include/fts.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/fts.h
rename to 9/platforms/android-21/arch-mips64/usr/include/fts.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/ftw.h b/9/platforms/android-21/arch-mips64/usr/include/ftw.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/ftw.h
rename to 9/platforms/android-21/arch-mips64/usr/include/ftw.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/getopt.h b/9/platforms/android-21/arch-mips64/usr/include/getopt.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/getopt.h
rename to 9/platforms/android-21/arch-mips64/usr/include/getopt.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/grp.h b/9/platforms/android-21/arch-mips64/usr/include/grp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/grp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/grp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/inttypes.h b/9/platforms/android-21/arch-mips64/usr/include/inttypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/inttypes.h
rename to 9/platforms/android-21/arch-mips64/usr/include/inttypes.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/jni.h b/9/platforms/android-21/arch-mips64/usr/include/jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/jni.h
rename to 9/platforms/android-21/arch-mips64/usr/include/jni.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/lastlog.h b/9/platforms/android-21/arch-mips64/usr/include/lastlog.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/lastlog.h
rename to 9/platforms/android-21/arch-mips64/usr/include/lastlog.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/libgen.h b/9/platforms/android-21/arch-mips64/usr/include/libgen.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/libgen.h
rename to 9/platforms/android-21/arch-mips64/usr/include/libgen.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/limits.h b/9/platforms/android-21/arch-mips64/usr/include/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/limits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/limits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/link.h b/9/platforms/android-21/arch-mips64/usr/include/link.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/link.h
rename to 9/platforms/android-21/arch-mips64/usr/include/link.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/a.out.h b/9/platforms/android-21/arch-mips64/usr/include/linux/a.out.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/a.out.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/a.out.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/acct.h b/9/platforms/android-21/arch-mips64/usr/include/linux/acct.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/acct.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/acct.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/adb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/adb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/adb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/adb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/adfs_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/adfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/adfs_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/adfs_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/affs_hardblocks.h b/9/platforms/android-21/arch-mips64/usr/include/linux/affs_hardblocks.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/affs_hardblocks.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/affs_hardblocks.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/agpgart.h b/9/platforms/android-21/arch-mips64/usr/include/linux/agpgart.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/agpgart.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/agpgart.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/aio_abi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/aio_abi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/aio_abi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/aio_abi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/android_alarm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/android_alarm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/android_alarm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/android_alarm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/apm_bios.h b/9/platforms/android-21/arch-mips64/usr/include/linux/apm_bios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/apm_bios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/apm_bios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/arcfb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/arcfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/arcfb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/arcfb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ashmem.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ashmem.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ashmem.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ashmem.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atalk.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atalk.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atalk.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atalk.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm_eni.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm_eni.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm_eni.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm_eni.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm_he.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm_he.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm_he.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm_he.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm_idt77105.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm_idt77105.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm_idt77105.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm_idt77105.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm_nicstar.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm_nicstar.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm_nicstar.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm_nicstar.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm_tcp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm_tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm_tcp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm_tcp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atm_zatm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atm_zatm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atm_zatm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atm_zatm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmapi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmapi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmapi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmapi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmarp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmarp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmarp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmarp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmbr2684.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmbr2684.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmbr2684.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmbr2684.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmclip.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmclip.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmclip.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmclip.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmdev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmdev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmdev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmioc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmioc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmioc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmioc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmlec.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmlec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmlec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmlec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmmpc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmmpc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmmpc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmmpc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmppp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmppp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmppp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmsap.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmsap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmsap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmsap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/atmsvc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/atmsvc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/atmsvc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/atmsvc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/audit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/audit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/audit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/audit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/auto_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/auto_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/auto_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/auto_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/auto_fs4.h b/9/platforms/android-21/arch-mips64/usr/include/linux/auto_fs4.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/auto_fs4.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/auto_fs4.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/auxvec.h b/9/platforms/android-21/arch-mips64/usr/include/linux/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/auxvec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/auxvec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ax25.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ax25.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ax25.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ax25.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/b1lli.h b/9/platforms/android-21/arch-mips64/usr/include/linux/b1lli.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/b1lli.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/b1lli.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/baycom.h b/9/platforms/android-21/arch-mips64/usr/include/linux/baycom.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/baycom.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/baycom.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/bcache.h b/9/platforms/android-21/arch-mips64/usr/include/linux/bcache.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/bcache.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/bcache.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/bcm933xx_hcs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/bcm933xx_hcs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/bcm933xx_hcs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/bcm933xx_hcs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/bfs_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/bfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/bfs_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/bfs_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/binder.h b/9/platforms/android-21/arch-mips64/usr/include/linux/binder.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/binder.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/binder.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/binfmts.h b/9/platforms/android-21/arch-mips64/usr/include/linux/binfmts.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/binfmts.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/binfmts.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/blkpg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/blkpg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/blkpg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/blkpg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/blktrace_api.h b/9/platforms/android-21/arch-mips64/usr/include/linux/blktrace_api.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/blktrace_api.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/blktrace_api.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/bpqether.h b/9/platforms/android-21/arch-mips64/usr/include/linux/bpqether.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/bpqether.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/bpqether.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/bsg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/bsg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/bsg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/bsg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/btrfs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/btrfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/btrfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/btrfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/byteorder/big_endian.h b/9/platforms/android-21/arch-mips64/usr/include/linux/byteorder/big_endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/byteorder/big_endian.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/byteorder/big_endian.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/byteorder/little_endian.h b/9/platforms/android-21/arch-mips64/usr/include/linux/byteorder/little_endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/byteorder/little_endian.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/byteorder/little_endian.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/caif/caif_socket.h b/9/platforms/android-21/arch-mips64/usr/include/linux/caif/caif_socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/caif/caif_socket.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/caif/caif_socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/caif/if_caif.h b/9/platforms/android-21/arch-mips64/usr/include/linux/caif/if_caif.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/caif/if_caif.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/caif/if_caif.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/can.h b/9/platforms/android-21/arch-mips64/usr/include/linux/can.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/can.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/can.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/can/bcm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/can/bcm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/can/bcm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/can/bcm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/can/error.h b/9/platforms/android-21/arch-mips64/usr/include/linux/can/error.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/can/error.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/can/error.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/can/gw.h b/9/platforms/android-21/arch-mips64/usr/include/linux/can/gw.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/can/gw.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/can/gw.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/can/netlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/can/netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/can/netlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/can/netlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/can/raw.h b/9/platforms/android-21/arch-mips64/usr/include/linux/can/raw.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/can/raw.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/can/raw.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/capability.h b/9/platforms/android-21/arch-mips64/usr/include/linux/capability.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/capability.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/capability.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/capi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/capi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/capi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/capi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cciss_defs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cciss_defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cciss_defs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cciss_defs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cciss_ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cciss_ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cciss_ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cciss_ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cdrom.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cdrom.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cdrom.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cdrom.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cgroupstats.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cgroupstats.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cgroupstats.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cgroupstats.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/chio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/chio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/chio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/chio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cifs/cifs_mount.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cifs/cifs_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cifs/cifs_mount.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cifs/cifs_mount.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cm4000_cs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cm4000_cs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cm4000_cs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cm4000_cs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cn_proc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cn_proc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cn_proc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cn_proc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/coda.h b/9/platforms/android-21/arch-mips64/usr/include/linux/coda.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/coda.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/coda.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/coda_psdev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/coda_psdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/coda_psdev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/coda_psdev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/coff.h b/9/platforms/android-21/arch-mips64/usr/include/linux/coff.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/coff.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/coff.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/compiler.h b/9/platforms/android-21/arch-mips64/usr/include/linux/compiler.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/compiler.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/compiler.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/connector.h b/9/platforms/android-21/arch-mips64/usr/include/linux/connector.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/connector.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/connector.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/const.h b/9/platforms/android-21/arch-mips64/usr/include/linux/const.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/const.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/const.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cramfs_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cramfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cramfs_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cramfs_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cuda.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cuda.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cuda.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cuda.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cyclades.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cyclades.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cyclades.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cyclades.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/cycx_cfm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/cycx_cfm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/cycx_cfm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/cycx_cfm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dcbnl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dcbnl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dcbnl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dcbnl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dccp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dccp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dccp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dccp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dlm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dlm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dlm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dlm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dlm_device.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dlm_device.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dlm_device.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dlm_device.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dlm_netlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dlm_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dlm_netlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dlm_netlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dlm_plock.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dlm_plock.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dlm_plock.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dlm_plock.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dlmconstants.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dlmconstants.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dlmconstants.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dlmconstants.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dm-ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dm-ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dm-ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dm-ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dm-log-userspace.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dm-log-userspace.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dm-log-userspace.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dm-log-userspace.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dn.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dn.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dn.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dn.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dqblk_xfs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dqblk_xfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dqblk_xfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dqblk_xfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/audio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/audio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/audio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/audio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/ca.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/ca.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/ca.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/ca.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/dmx.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/dmx.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/dmx.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/dmx.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/frontend.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/frontend.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/frontend.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/frontend.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/net.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/net.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/net.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/net.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/osd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/osd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/osd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/osd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/version.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/version.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/version.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/version.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/dvb/video.h b/9/platforms/android-21/arch-mips64/usr/include/linux/dvb/video.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/dvb/video.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/dvb/video.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/edd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/edd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/edd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/edd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/efs_fs_sb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/efs_fs_sb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/efs_fs_sb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/efs_fs_sb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/elf-em.h b/9/platforms/android-21/arch-mips64/usr/include/linux/elf-em.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/elf-em.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/elf-em.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/elf-fdpic.h b/9/platforms/android-21/arch-mips64/usr/include/linux/elf-fdpic.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/elf-fdpic.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/elf-fdpic.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/elf.h b/9/platforms/android-21/arch-mips64/usr/include/linux/elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/elf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/elf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/elfcore.h b/9/platforms/android-21/arch-mips64/usr/include/linux/elfcore.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/elfcore.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/elfcore.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/errno.h b/9/platforms/android-21/arch-mips64/usr/include/linux/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/errno.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/errno.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/errqueue.h b/9/platforms/android-21/arch-mips64/usr/include/linux/errqueue.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/errqueue.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/errqueue.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ethtool.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ethtool.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ethtool.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ethtool.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/eventpoll.h b/9/platforms/android-21/arch-mips64/usr/include/linux/eventpoll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/eventpoll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/eventpoll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fadvise.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fadvise.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fadvise.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fadvise.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/falloc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/falloc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/falloc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/falloc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fanotify.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fanotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fanotify.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fanotify.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fcntl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fcntl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fcntl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fdreg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fdreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fdreg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fdreg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fib_rules.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fib_rules.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fib_rules.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fib_rules.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fiemap.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fiemap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fiemap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fiemap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/filter.h b/9/platforms/android-21/arch-mips64/usr/include/linux/filter.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/filter.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/filter.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/firewire-cdev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/firewire-cdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/firewire-cdev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/firewire-cdev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/firewire-constants.h b/9/platforms/android-21/arch-mips64/usr/include/linux/firewire-constants.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/firewire-constants.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/firewire-constants.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/flat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/flat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/flat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/flat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fsl_hypervisor.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fsl_hypervisor.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fsl_hypervisor.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fsl_hypervisor.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/fuse.h b/9/platforms/android-21/arch-mips64/usr/include/linux/fuse.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/fuse.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/fuse.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/futex.h b/9/platforms/android-21/arch-mips64/usr/include/linux/futex.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/futex.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/futex.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/gameport.h b/9/platforms/android-21/arch-mips64/usr/include/linux/gameport.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/gameport.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/gameport.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/gen_stats.h b/9/platforms/android-21/arch-mips64/usr/include/linux/gen_stats.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/gen_stats.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/gen_stats.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/genetlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/genetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/genetlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/genetlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/genwqe/genwqe_card.h b/9/platforms/android-21/arch-mips64/usr/include/linux/genwqe/genwqe_card.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/genwqe/genwqe_card.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/genwqe/genwqe_card.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/gfs2_ondisk.h b/9/platforms/android-21/arch-mips64/usr/include/linux/gfs2_ondisk.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/gfs2_ondisk.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/gfs2_ondisk.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/gigaset_dev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/gigaset_dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/gigaset_dev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/gigaset_dev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hash_info.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hash_info.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hash_info.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hash_info.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hdlc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hdlc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hdlc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hdlc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hdlc/ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hdlc/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hdlc/ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hdlc/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hdlcdrv.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hdlcdrv.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hdlcdrv.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hdlcdrv.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hdreg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hdreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hdreg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hdreg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hid.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hid.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hid.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hid.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hiddev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hiddev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hiddev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hiddev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hidraw.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hidraw.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hidraw.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hidraw.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hpet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hpet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hpet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hpet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hsi/hsi_char.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hsi/hsi_char.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hsi/hsi_char.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hsi/hsi_char.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hsr_netlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hsr_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hsr_netlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hsr_netlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hw_breakpoint.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hw_breakpoint.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hw_breakpoint.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/hysdn_if.h b/9/platforms/android-21/arch-mips64/usr/include/linux/hysdn_if.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/hysdn_if.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/hysdn_if.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/i2c-dev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/i2c-dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/i2c-dev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/i2c-dev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/i2c.h b/9/platforms/android-21/arch-mips64/usr/include/linux/i2c.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/i2c.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/i2c.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/i2o-dev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/i2o-dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/i2o-dev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/i2o-dev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/i8k.h b/9/platforms/android-21/arch-mips64/usr/include/linux/i8k.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/i8k.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/i8k.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/icmp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/icmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/icmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/icmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/icmpv6.h b/9/platforms/android-21/arch-mips64/usr/include/linux/icmpv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/icmpv6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/icmpv6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_addr.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_addr.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_addr.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_addr.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_addrlabel.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_addrlabel.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_addrlabel.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_addrlabel.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_alg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_alg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_alg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_alg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_arcnet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_arcnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_arcnet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_arcnet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_arp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_arp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_arp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_bonding.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_bonding.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_bonding.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_bonding.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_bridge.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_bridge.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_bridge.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_bridge.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_cablemodem.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_cablemodem.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_cablemodem.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_cablemodem.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_eql.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_eql.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_eql.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_eql.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_ether.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_ether.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_ether.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_fc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_fc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_fc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_fc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_fddi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_fddi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_fddi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_fddi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_frad.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_frad.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_frad.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_frad.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_hippi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_hippi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_hippi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_hippi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_infiniband.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_infiniband.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_infiniband.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_infiniband.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_link.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_link.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_link.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_link.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_ltalk.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_ltalk.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_ltalk.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_ltalk.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_packet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_packet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_packet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_phonet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_phonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_phonet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_phonet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_plip.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_plip.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_plip.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_plip.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_ppp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_ppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_ppp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_ppp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_pppol2tp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_pppol2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_pppol2tp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_pppol2tp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_pppolac.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_pppolac.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_pppolac.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_pppolac.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_pppopns.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_pppopns.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_pppopns.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_pppopns.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_pppox.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_pppox.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_pppox.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_pppox.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_slip.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_slip.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_slip.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_slip.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_team.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_team.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_team.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_team.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_tun.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_tun.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_tun.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_tun.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_tunnel.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_tunnel.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_tunnel.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_tunnel.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_vlan.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_vlan.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_vlan.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_vlan.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/if_x25.h b/9/platforms/android-21/arch-mips64/usr/include/linux/if_x25.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/if_x25.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/if_x25.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/igmp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/igmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/igmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/igmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/in.h b/9/platforms/android-21/arch-mips64/usr/include/linux/in.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/in.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/in.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/in6.h b/9/platforms/android-21/arch-mips64/usr/include/linux/in6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/in6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/in6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/in_route.h b/9/platforms/android-21/arch-mips64/usr/include/linux/in_route.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/in_route.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/in_route.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/inet_diag.h b/9/platforms/android-21/arch-mips64/usr/include/linux/inet_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/inet_diag.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/inet_diag.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/inotify.h b/9/platforms/android-21/arch-mips64/usr/include/linux/inotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/inotify.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h b/9/platforms/android-21/arch-mips64/usr/include/linux/input.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/input.h
copy to 9/platforms/android-21/arch-mips64/usr/include/linux/input.h
index df3200c..b9d5b2a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/linux/input.h
@@ -97,629 +97,644 @@
 #define INPUT_PROP_BUTTONPAD 0x02
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define INPUT_PROP_SEMI_MT 0x03
+#define INPUT_PROP_TOPBUTTONPAD 0x04
 #define INPUT_PROP_MAX 0x1f
 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_SYN 0x00
 #define EV_KEY 0x01
 #define EV_REL 0x02
 #define EV_ABS 0x03
-#define EV_MSC 0x04
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MSC 0x04
 #define EV_SW 0x05
 #define EV_LED 0x11
 #define EV_SND 0x12
-#define EV_REP 0x14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_REP 0x14
 #define EV_FF 0x15
 #define EV_PWR 0x16
 #define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MAX 0x1f
 #define EV_CNT (EV_MAX+1)
 #define SYN_REPORT 0
 #define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SYN_MT_REPORT 2
 #define SYN_DROPPED 3
 #define SYN_MAX 0xf
 #define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RESERVED 0
 #define KEY_ESC 1
 #define KEY_1 2
 #define KEY_2 3
-#define KEY_3 4
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_3 4
 #define KEY_4 5
 #define KEY_5 6
 #define KEY_6 7
-#define KEY_7 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_7 8
 #define KEY_8 9
 #define KEY_9 10
 #define KEY_0 11
-#define KEY_MINUS 12
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MINUS 12
 #define KEY_EQUAL 13
 #define KEY_BACKSPACE 14
 #define KEY_TAB 15
-#define KEY_Q 16
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Q 16
 #define KEY_W 17
 #define KEY_E 18
 #define KEY_R 19
-#define KEY_T 20
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_T 20
 #define KEY_Y 21
 #define KEY_U 22
 #define KEY_I 23
-#define KEY_O 24
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_O 24
 #define KEY_P 25
 #define KEY_LEFTBRACE 26
 #define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ENTER 28
 #define KEY_LEFTCTRL 29
 #define KEY_A 30
 #define KEY_S 31
-#define KEY_D 32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_D 32
 #define KEY_F 33
 #define KEY_G 34
 #define KEY_H 35
-#define KEY_J 36
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_J 36
 #define KEY_K 37
 #define KEY_L 38
 #define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_APOSTROPHE 40
 #define KEY_GRAVE 41
 #define KEY_LEFTSHIFT 42
 #define KEY_BACKSLASH 43
-#define KEY_Z 44
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Z 44
 #define KEY_X 45
 #define KEY_C 46
 #define KEY_V 47
-#define KEY_B 48
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_B 48
 #define KEY_N 49
 #define KEY_M 50
 #define KEY_COMMA 51
-#define KEY_DOT 52
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DOT 52
 #define KEY_SLASH 53
 #define KEY_RIGHTSHIFT 54
 #define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFTALT 56
 #define KEY_SPACE 57
 #define KEY_CAPSLOCK 58
 #define KEY_F1 59
-#define KEY_F2 60
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F2 60
 #define KEY_F3 61
 #define KEY_F4 62
 #define KEY_F5 63
-#define KEY_F6 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F6 64
 #define KEY_F7 65
 #define KEY_F8 66
 #define KEY_F9 67
-#define KEY_F10 68
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F10 68
 #define KEY_NUMLOCK 69
 #define KEY_SCROLLLOCK 70
 #define KEY_KP7 71
-#define KEY_KP8 72
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP8 72
 #define KEY_KP9 73
 #define KEY_KPMINUS 74
 #define KEY_KP4 75
-#define KEY_KP5 76
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP5 76
 #define KEY_KP6 77
 #define KEY_KPPLUS 78
 #define KEY_KP1 79
-#define KEY_KP2 80
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP2 80
 #define KEY_KP3 81
 #define KEY_KP0 82
 #define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ZENKAKUHANKAKU 85
 #define KEY_102ND 86
 #define KEY_F11 87
 #define KEY_F12 88
-#define KEY_RO 89
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RO 89
 #define KEY_KATAKANA 90
 #define KEY_HIRAGANA 91
 #define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KATAKANAHIRAGANA 93
 #define KEY_MUHENKAN 94
 #define KEY_KPJPCOMMA 95
 #define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RIGHTCTRL 97
 #define KEY_KPSLASH 98
 #define KEY_SYSRQ 99
 #define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LINEFEED 101
 #define KEY_HOME 102
 #define KEY_UP 103
 #define KEY_PAGEUP 104
-#define KEY_LEFT 105
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFT 105
 #define KEY_RIGHT 106
 #define KEY_END 107
 #define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PAGEDOWN 109
 #define KEY_INSERT 110
 #define KEY_DELETE 111
 #define KEY_MACRO 112
-#define KEY_MUTE 113
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MUTE 113
 #define KEY_VOLUMEDOWN 114
 #define KEY_VOLUMEUP 115
 #define KEY_POWER 116
-#define KEY_KPEQUAL 117
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPEQUAL 117
 #define KEY_KPPLUSMINUS 118
 #define KEY_PAUSE 119
 #define KEY_SCALE 120
-#define KEY_KPCOMMA 121
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPCOMMA 121
 #define KEY_HANGEUL 122
 #define KEY_HANGUEL KEY_HANGEUL
 #define KEY_HANJA 123
-#define KEY_YEN 124
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_YEN 124
 #define KEY_LEFTMETA 125
 #define KEY_RIGHTMETA 126
 #define KEY_COMPOSE 127
-#define KEY_STOP 128
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_STOP 128
 #define KEY_AGAIN 129
 #define KEY_PROPS 130
 #define KEY_UNDO 131
-#define KEY_FRONT 132
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FRONT 132
 #define KEY_COPY 133
 #define KEY_OPEN 134
 #define KEY_PASTE 135
-#define KEY_FIND 136
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FIND 136
 #define KEY_CUT 137
 #define KEY_HELP 138
 #define KEY_MENU 139
-#define KEY_CALC 140
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CALC 140
 #define KEY_SETUP 141
 #define KEY_SLEEP 142
 #define KEY_WAKEUP 143
-#define KEY_FILE 144
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FILE 144
 #define KEY_SENDFILE 145
 #define KEY_DELETEFILE 146
 #define KEY_XFER 147
-#define KEY_PROG1 148
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PROG1 148
 #define KEY_PROG2 149
 #define KEY_WWW 150
 #define KEY_MSDOS 151
-#define KEY_COFFEE 152
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_COFFEE 152
 #define KEY_SCREENLOCK KEY_COFFEE
 #define KEY_DIRECTION 153
 #define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MAIL 155
 #define KEY_BOOKMARKS 156
 #define KEY_COMPUTER 157
 #define KEY_BACK 158
-#define KEY_FORWARD 159
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FORWARD 159
 #define KEY_CLOSECD 160
 #define KEY_EJECTCD 161
 #define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_NEXTSONG 163
 #define KEY_PLAYPAUSE 164
 #define KEY_PREVIOUSSONG 165
 #define KEY_STOPCD 166
-#define KEY_RECORD 167
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RECORD 167
 #define KEY_REWIND 168
 #define KEY_PHONE 169
 #define KEY_ISO 170
-#define KEY_CONFIG 171
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CONFIG 171
 #define KEY_HOMEPAGE 172
 #define KEY_REFRESH 173
 #define KEY_EXIT 174
-#define KEY_MOVE 175
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MOVE 175
 #define KEY_EDIT 176
 #define KEY_SCROLLUP 177
 #define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPLEFTPAREN 179
 #define KEY_KPRIGHTPAREN 180
 #define KEY_NEW 181
 #define KEY_REDO 182
-#define KEY_F13 183
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F13 183
 #define KEY_F14 184
 #define KEY_F15 185
 #define KEY_F16 186
-#define KEY_F17 187
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F17 187
 #define KEY_F18 188
 #define KEY_F19 189
 #define KEY_F20 190
-#define KEY_F21 191
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F21 191
 #define KEY_F22 192
 #define KEY_F23 193
 #define KEY_F24 194
-#define KEY_PLAYCD 200
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PLAYCD 200
 #define KEY_PAUSECD 201
 #define KEY_PROG3 202
 #define KEY_PROG4 203
-#define KEY_DASHBOARD 204
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DASHBOARD 204
 #define KEY_SUSPEND 205
 #define KEY_CLOSE 206
 #define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FASTFORWARD 208
 #define KEY_BASSBOOST 209
 #define KEY_PRINT 210
 #define KEY_HP 211
-#define KEY_CAMERA 212
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CAMERA 212
 #define KEY_SOUND 213
 #define KEY_QUESTION 214
 #define KEY_EMAIL 215
-#define KEY_CHAT 216
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CHAT 216
 #define KEY_SEARCH 217
 #define KEY_CONNECT 218
 #define KEY_FINANCE 219
-#define KEY_SPORT 220
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SPORT 220
 #define KEY_SHOP 221
 #define KEY_ALTERASE 222
 #define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESSDOWN 224
 #define KEY_BRIGHTNESSUP 225
 #define KEY_MEDIA 226
 #define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KBDILLUMTOGGLE 228
 #define KEY_KBDILLUMDOWN 229
 #define KEY_KBDILLUMUP 230
 #define KEY_SEND 231
-#define KEY_REPLY 232
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_REPLY 232
 #define KEY_FORWARDMAIL 233
 #define KEY_SAVE 234
 #define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BATTERY 236
 #define KEY_BLUETOOTH 237
 #define KEY_WLAN 238
 #define KEY_UWB 239
-#define KEY_UNKNOWN 240
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_UNKNOWN 240
 #define KEY_VIDEO_NEXT 241
 #define KEY_VIDEO_PREV 242
 #define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_AUTO 244
+#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF 245
 #define KEY_WWAN 246
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WIMAX KEY_WWAN
 #define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MICMUTE 248
 #define BTN_MISC 0x100
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_0 0x100
 #define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_2 0x102
 #define BTN_3 0x103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_4 0x104
 #define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_6 0x106
 #define BTN_7 0x107
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_8 0x108
 #define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MOUSE 0x110
 #define BTN_LEFT 0x110
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_RIGHT 0x111
 #define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SIDE 0x113
 #define BTN_EXTRA 0x114
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_FORWARD 0x115
 #define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TASK 0x117
 #define BTN_JOYSTICK 0x120
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER 0x120
 #define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMB2 0x122
 #define BTN_TOP 0x123
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOP2 0x124
 #define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE 0x126
 #define BTN_BASE2 0x127
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE3 0x128
 #define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE5 0x12a
 #define BTN_BASE6 0x12b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DEAD 0x12f
 #define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SOUTH 0x130
 #define BTN_A BTN_SOUTH
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_EAST 0x131
 #define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_C 0x132
 #define BTN_NORTH 0x133
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_X BTN_NORTH
 #define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_Y BTN_WEST
 #define BTN_Z 0x135
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL 0x136
 #define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL2 0x138
 #define BTN_TR2 0x139
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SELECT 0x13a
 #define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MODE 0x13c
 #define BTN_THUMBL 0x13d
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMBR 0x13e
 #define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_PEN 0x140
 #define BTN_TOOL_RUBBER 0x141
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_BRUSH 0x142
 #define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_AIRBRUSH 0x144
 #define BTN_TOOL_FINGER 0x145
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_MOUSE 0x146
 #define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUINTTAP 0x148
 #define BTN_TOUCH 0x14a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_STYLUS 0x14b
 #define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_DOUBLETAP 0x14d
 #define BTN_TOOL_TRIPLETAP 0x14e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUADTAP 0x14f
 #define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_GEAR_DOWN 0x150
 #define BTN_GEAR_UP 0x151
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_OK 0x160
 #define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GOTO 0x162
 #define KEY_CLEAR 0x163
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_POWER2 0x164
 #define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_INFO 0x166
 #define KEY_TIME 0x167
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VENDOR 0x168
 #define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PROGRAM 0x16a
 #define KEY_CHANNEL 0x16b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FAVORITES 0x16c
 #define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PVR 0x16e
 #define KEY_MHP 0x16f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_LANGUAGE 0x170
 #define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SUBTITLE 0x172
 #define KEY_ANGLE 0x173
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOM 0x174
 #define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_KEYBOARD 0x176
 #define KEY_SCREEN 0x177
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PC 0x178
 #define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TV2 0x17a
 #define KEY_VCR 0x17b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VCR2 0x17c
 #define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SAT2 0x17e
 #define KEY_CD 0x17f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TAPE 0x180
 #define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TUNER 0x182
 #define KEY_PLAYER 0x183
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEXT 0x184
 #define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUX 0x186
 #define KEY_MP3 0x187
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUDIO 0x188
 #define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DIRECTORY 0x18a
 #define KEY_LIST 0x18b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEMO 0x18c
 #define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RED 0x18e
 #define KEY_GREEN 0x18f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_YELLOW 0x190
 #define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CHANNELUP 0x192
 #define KEY_CHANNELDOWN 0x193
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FIRST 0x194
 #define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AB 0x196
 #define KEY_NEXT 0x197
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RESTART 0x198
 #define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SHUFFLE 0x19a
 #define KEY_BREAK 0x19b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PREVIOUS 0x19c
 #define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEEN 0x19e
 #define KEY_TWEN 0x19f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VIDEOPHONE 0x1a0
 #define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMIN 0x1a2
 #define KEY_ZOOMOUT 0x1a3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMRESET 0x1a4
 #define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EDITOR 0x1a6
 #define KEY_SPREADSHEET 0x1a7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GRAPHICSEDITOR 0x1a8
 #define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DATABASE 0x1aa
 #define KEY_NEWS 0x1ab
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VOICEMAIL 0x1ac
 #define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MESSENGER 0x1ae
 #define KEY_DISPLAYTOGGLE 0x1af
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK 0x1b0
 #define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DOLLAR 0x1b2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EURO 0x1b3
 #define KEY_FRAMEBACK 0x1b4
 #define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CONTEXT_MENU 0x1b6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEDIA_REPEAT 0x1b7
 #define KEY_10CHANNELSUP 0x1b8
 #define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_IMAGES 0x1ba
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_EOL 0x1c0
 #define KEY_DEL_EOS 0x1c1
 #define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_LINE 0x1c3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN 0x1d0
 #define KEY_FN_ESC 0x1d1
 #define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F2 0x1d3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F3 0x1d4
 #define KEY_FN_F4 0x1d5
 #define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F6 0x1d7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F7 0x1d8
 #define KEY_FN_F8 0x1d9
 #define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F10 0x1db
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F11 0x1dc
 #define KEY_FN_F12 0x1dd
 #define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_2 0x1df
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_D 0x1e0
 #define KEY_FN_E 0x1e1
 #define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_S 0x1e3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_B 0x1e4
 #define KEY_BRL_DOT1 0x1f1
 #define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT3 0x1f3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT4 0x1f4
 #define KEY_BRL_DOT5 0x1f5
 #define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT7 0x1f7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT8 0x1f8
 #define KEY_BRL_DOT9 0x1f9
 #define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_0 0x200
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_1 0x201
 #define KEY_NUMERIC_2 0x202
 #define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_4 0x204
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_5 0x205
 #define KEY_NUMERIC_6 0x206
 #define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_8 0x208
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_9 0x209
 #define KEY_NUMERIC_STAR 0x20a
 #define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_FOCUS 0x210
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WPS_BUTTON 0x211
 #define KEY_TOUCHPAD_TOGGLE 0x212
 #define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TOUCHPAD_OFF 0x214
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_ZOOMIN 0x215
 #define KEY_CAMERA_ZOOMOUT 0x216
 #define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_DOWN 0x218
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_LEFT 0x219
 #define KEY_CAMERA_RIGHT 0x21a
 #define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_OFF 0x21c
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_TOGGLE 0x21d
 #define KEY_LIGHTS_TOGGLE 0x21e
 #define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_DOWN 0x221
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_LEFT 0x222
 #define BTN_DPAD_RIGHT 0x223
 #define KEY_ALS_TOGGLE 0x230
+#define KEY_BUTTONCONFIG 0x240
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_TASKMANAGER 0x241
+#define KEY_JOURNAL 0x242
+#define KEY_CONTROLPANEL 0x243
+#define KEY_APPSELECT 0x244
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SCREENSAVER 0x245
+#define KEY_VOICECOMMAND 0x246
+#define KEY_BRIGHTNESS_MIN 0x250
+#define KEY_BRIGHTNESS_MAX 0x251
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER_HAPPY 0x2c0
 #define BTN_TRIGGER_HAPPY1 0x2c0
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ion.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ion.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ion.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ion.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ioprio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ioprio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ioprio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ioprio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ip.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ip.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ip.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ip6_tunnel.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ip6_tunnel.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ip6_tunnel.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ip6_tunnel.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ip_vs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ip_vs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ip_vs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ip_vs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipmi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipmi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipmi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipmi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipmi_msgdefs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipmi_msgdefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipmi_msgdefs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipmi_msgdefs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipsec.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipsec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipsec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipsec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipv6.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipv6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipv6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipv6_route.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipv6_route.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipv6_route.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipv6_route.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ipx.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ipx.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ipx.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ipx.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/irda.h b/9/platforms/android-21/arch-mips64/usr/include/linux/irda.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/irda.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/irda.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/irqnr.h b/9/platforms/android-21/arch-mips64/usr/include/linux/irqnr.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/irqnr.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/irqnr.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/isdn.h b/9/platforms/android-21/arch-mips64/usr/include/linux/isdn.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/isdn.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/isdn.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/isdn/capicmd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/isdn/capicmd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/isdn/capicmd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/isdn/capicmd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/isdn_divertif.h b/9/platforms/android-21/arch-mips64/usr/include/linux/isdn_divertif.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/isdn_divertif.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/isdn_divertif.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/isdn_ppp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/isdn_ppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/isdn_ppp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/isdn_ppp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/isdnif.h b/9/platforms/android-21/arch-mips64/usr/include/linux/isdnif.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/isdnif.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/isdnif.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/iso_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/iso_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/iso_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/iso_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ivtv.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ivtv.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ivtv.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ivtv.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ivtvfb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ivtvfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ivtvfb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ivtvfb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ixjuser.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ixjuser.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ixjuser.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ixjuser.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/jffs2.h b/9/platforms/android-21/arch-mips64/usr/include/linux/jffs2.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/jffs2.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/jffs2.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/joystick.h b/9/platforms/android-21/arch-mips64/usr/include/linux/joystick.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/joystick.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/joystick.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kdev_t.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kdev_t.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kdev_t.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kdev_t.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kernel-page-flags.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kernel-page-flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kernel-page-flags.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kernel-page-flags.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kernel.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kernel.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kernel.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kernel.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kernelcapi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kernelcapi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kernelcapi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kernelcapi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kexec.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kexec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kexec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kexec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/keyboard.h b/9/platforms/android-21/arch-mips64/usr/include/linux/keyboard.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/keyboard.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/keyboard.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/keychord.h b/9/platforms/android-21/arch-mips64/usr/include/linux/keychord.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/keychord.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/keychord.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/keyctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/keyctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/keyctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/keyctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kvm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kvm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kvm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kvm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/kvm_para.h b/9/platforms/android-21/arch-mips64/usr/include/linux/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/kvm_para.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/kvm_para.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/l2tp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/l2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/l2tp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/l2tp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/libc-compat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/libc-compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/libc-compat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/libc-compat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/limits.h b/9/platforms/android-21/arch-mips64/usr/include/linux/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/limits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/limits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/llc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/llc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/llc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/llc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/loop.h b/9/platforms/android-21/arch-mips64/usr/include/linux/loop.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/loop.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/loop.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/lp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/lp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/lp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/lp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/magic.h b/9/platforms/android-21/arch-mips64/usr/include/linux/magic.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/magic.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/magic.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/major.h b/9/platforms/android-21/arch-mips64/usr/include/linux/major.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/major.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/major.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/map_to_7segment.h b/9/platforms/android-21/arch-mips64/usr/include/linux/map_to_7segment.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/map_to_7segment.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/map_to_7segment.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/matroxfb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/matroxfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/matroxfb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/matroxfb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mdio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mdio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mdio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mdio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/media.h b/9/platforms/android-21/arch-mips64/usr/include/linux/media.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/media.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/media.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mei.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mei.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mei.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mei.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mempolicy.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mempolicy.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mempolicy.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mempolicy.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/meye.h b/9/platforms/android-21/arch-mips64/usr/include/linux/meye.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/meye.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/meye.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mic_common.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mic_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mic_common.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mic_common.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mic_ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mic_ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mic_ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mic_ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mii.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mii.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mii.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mii.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/minix_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/minix_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/minix_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/minix_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mman.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mman.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mman.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mmc/ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mmc/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mmc/ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mmc/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mmtimer.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mmtimer.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mmtimer.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mmtimer.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/module.h b/9/platforms/android-21/arch-mips64/usr/include/linux/module.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/module.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/module.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mqueue.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mqueue.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mqueue.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mqueue.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mroute.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mroute.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mroute.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mroute.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mroute6.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mroute6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mroute6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mroute6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/msdos_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/msdos_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/msdos_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/msdos_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/msg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/msg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/msg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/msg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/mtio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/mtio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/mtio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/mtio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/n_r3964.h b/9/platforms/android-21/arch-mips64/usr/include/linux/n_r3964.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/n_r3964.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/n_r3964.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nbd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nbd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nbd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nbd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ncp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ncp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ncp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ncp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ncp_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ncp_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ncp_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ncp_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ncp_mount.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ncp_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ncp_mount.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ncp_mount.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ncp_no.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ncp_no.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ncp_no.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ncp_no.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/neighbour.h b/9/platforms/android-21/arch-mips64/usr/include/linux/neighbour.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/neighbour.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/neighbour.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/net.h b/9/platforms/android-21/arch-mips64/usr/include/linux/net.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/net.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/net.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/net_dropmon.h b/9/platforms/android-21/arch-mips64/usr/include/linux/net_dropmon.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/net_dropmon.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/net_dropmon.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/net_tstamp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/net_tstamp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/net_tstamp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/net_tstamp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netconf.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netconf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netconf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netdevice.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netdevice.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netdevice.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netdevice.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_hash.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_hash.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_list.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_list.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_common.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_common.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_common.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_ftp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_ftp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_sctp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_sctp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tcp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tcp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_nat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_nat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_nat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_tables.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_tables.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_tables.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_tables_compat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nf_tables_compat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nf_tables_compat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_acct.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_acct.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_acct.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_compat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_compat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_compat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_conntrack.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_conntrack.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_cthelper.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_cthelper.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_log.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_log.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_log.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_queue.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/nfnetlink_queue.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/nfnetlink_queue.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/x_tables.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/x_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/x_tables.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/x_tables.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_AUDIT.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_AUDIT.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_AUDIT.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CHECKSUM.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CHECKSUM.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CLASSIFY.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CLASSIFY.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CONNMARK.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CONNMARK.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CONNMARK.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CONNSECMARK.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CONNSECMARK.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CT.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CT.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_CT.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_CT.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_DSCP.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_DSCP.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_DSCP.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_DSCP.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_HMARK.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_HMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_HMARK.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_HMARK.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_IDLETIMER.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_IDLETIMER.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_LED.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_LED.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_LED.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_LED.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_LOG.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_LOG.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_LOG.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_MARK.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_MARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_MARK.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_MARK.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_NFLOG.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_NFLOG.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_NFLOG.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_NFQUEUE.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_NFQUEUE.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_RATEEST.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_RATEEST.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_RATEEST.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_SECMARK.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_SECMARK.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_SECMARK.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_SYNPROXY.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_SYNPROXY.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TCPMSS.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TCPMSS.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TCPMSS.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TEE.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TEE.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TEE.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TEE.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TPROXY.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_TPROXY.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_TPROXY.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_addrtype.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_addrtype.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_addrtype.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_addrtype.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_bpf.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_bpf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_bpf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_bpf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_cgroup.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_cgroup.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_cgroup.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_cgroup.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_cluster.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_cluster.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_cluster.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_cluster.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_comment.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_comment.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_comment.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_comment.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connbytes.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connbytes.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connbytes.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connbytes.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connlabel.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connlabel.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connlabel.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connlabel.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connlimit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connlimit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connlimit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connlimit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connmark.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connmark.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_connmark.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_connmark.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_conntrack.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_conntrack.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_conntrack.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_conntrack.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_cpu.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_cpu.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_cpu.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_cpu.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_dccp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_dccp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_dccp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_dccp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_devgroup.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_devgroup.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_devgroup.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_devgroup.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_dscp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_dscp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_dscp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_dscp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_ecn.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_ecn.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_ecn.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_ecn.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_esp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_esp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_esp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_esp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_hashlimit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_hashlimit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_hashlimit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_helper.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_helper.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_helper.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_helper.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_ipcomp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_ipcomp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_ipcomp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_iprange.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_iprange.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_iprange.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_iprange.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_ipvs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_ipvs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_ipvs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_ipvs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_l2tp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_l2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_l2tp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_l2tp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_length.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_length.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_length.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_length.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_limit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_limit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_limit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_limit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_mac.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_mac.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_mac.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_mac.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_mark.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_mark.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_mark.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_mark.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_multiport.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_multiport.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_multiport.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_multiport.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_nfacct.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_nfacct.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_nfacct.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_nfacct.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_osf.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_osf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_osf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_osf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_owner.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_owner.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_owner.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_owner.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_physdev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_physdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_physdev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_physdev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_pkttype.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_pkttype.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_pkttype.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_pkttype.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_policy.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_policy.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_policy.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_policy.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_quota.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_quota.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_quota.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_quota.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_rateest.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_rateest.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_rateest.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_rateest.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_realm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_realm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_realm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_realm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_recent.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_recent.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_recent.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_recent.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_rpfilter.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_rpfilter.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_rpfilter.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_sctp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_sctp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_sctp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_set.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_set.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_set.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_set.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_socket.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_socket.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_state.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_state.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_state.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_state.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_statistic.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_statistic.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_statistic.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_statistic.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_string.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_string.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_string.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_string.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_tcpmss.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_tcpmss.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_tcpmss.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_tcpudp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_tcpudp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_tcpudp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_time.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_time.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_time.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_time.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_u32.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_u32.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter/xt_u32.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter/xt_u32.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_arp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_arp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_arp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_arp/arp_tables.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_arp/arp_tables.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_arp/arp_tables.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_arp/arpt_mangle.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_arp/arpt_mangle.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_802_3.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_802_3.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_among.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_among.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_among.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip6.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_limit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_limit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_log.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_log.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_log.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nflog.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nflog.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_redirect.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_redirect.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_stp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_stp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ulog.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ulog.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_vlan.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebt_vlan.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebtables.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_bridge/ebtables.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_bridge/ebtables.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_decnet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_decnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_decnet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_decnet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ip_tables.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ip_tables.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ah.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ah.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6_tables.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6_tables.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netlink_diag.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netlink_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netlink_diag.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netlink_diag.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/netrom.h b/9/platforms/android-21/arch-mips64/usr/include/linux/netrom.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/netrom.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/netrom.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs2.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs2.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs2.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs2.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs3.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs3.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs3.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs3.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs4.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs4.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs4.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs4.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs4_mount.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs4_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs4_mount.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs4_mount.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs_idmap.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs_idmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs_idmap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs_idmap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfs_mount.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfs_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfs_mount.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfs_mount.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfsacl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfsacl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfsacl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfsacl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/cld.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/cld.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/cld.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/cld.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/debug.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/debug.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/debug.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/debug.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/export.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/export.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/export.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/export.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/nfsfh.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/nfsfh.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/nfsfh.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/nfsfh.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/stats.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/stats.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nfsd/stats.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nfsd/stats.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nl80211.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nl80211.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nl80211.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nl80211.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nubus.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nubus.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nubus.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nubus.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nvme.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nvme.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nvme.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nvme.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/nvram.h b/9/platforms/android-21/arch-mips64/usr/include/linux/nvram.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/nvram.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/nvram.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/omap3isp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/omap3isp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/omap3isp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/omap3isp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/omapfb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/omapfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/omapfb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/omapfb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/oom.h b/9/platforms/android-21/arch-mips64/usr/include/linux/oom.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/oom.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/oom.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/openvswitch.h b/9/platforms/android-21/arch-mips64/usr/include/linux/openvswitch.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/openvswitch.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/openvswitch.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/packet_diag.h b/9/platforms/android-21/arch-mips64/usr/include/linux/packet_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/packet_diag.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/packet_diag.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/param.h b/9/platforms/android-21/arch-mips64/usr/include/linux/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/param.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/param.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/parport.h b/9/platforms/android-21/arch-mips64/usr/include/linux/parport.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/parport.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/parport.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/patchkey.h b/9/platforms/android-21/arch-mips64/usr/include/linux/patchkey.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/patchkey.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/patchkey.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pci.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pci.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pci.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pci.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pci_regs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pci_regs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pci_regs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pci_regs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/perf_event.h b/9/platforms/android-21/arch-mips64/usr/include/linux/perf_event.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/perf_event.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/perf_event.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/personality.h b/9/platforms/android-21/arch-mips64/usr/include/linux/personality.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/personality.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/personality.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pfkeyv2.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pfkeyv2.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pfkeyv2.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pfkeyv2.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/phantom.h b/9/platforms/android-21/arch-mips64/usr/include/linux/phantom.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/phantom.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/phantom.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/phonet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/phonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/phonet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/phonet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pkt_cls.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pkt_cls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pkt_cls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pkt_cls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pkt_sched.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pkt_sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pkt_sched.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pkt_sched.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pktcdvd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pktcdvd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pktcdvd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pktcdvd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pmu.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pmu.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pmu.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pmu.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/poll.h b/9/platforms/android-21/arch-mips64/usr/include/linux/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/poll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/poll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/posix_types.h b/9/platforms/android-21/arch-mips64/usr/include/linux/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/posix_types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/posix_types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ppdev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ppdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ppdev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ppdev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ppp-comp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ppp-comp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ppp-comp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ppp-comp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ppp-ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ppp-ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ppp-ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ppp-ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ppp_defs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ppp_defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ppp_defs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ppp_defs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/pps.h b/9/platforms/android-21/arch-mips64/usr/include/linux/pps.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/pps.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/pps.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/prctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/prctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/prctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ptp_clock.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ptp_clock.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ptp_clock.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ptp_clock.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ptrace.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ptrace.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ptrace.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/qnx4_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/qnx4_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/qnx4_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/qnx4_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/qnxtypes.h b/9/platforms/android-21/arch-mips64/usr/include/linux/qnxtypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/qnxtypes.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/qnxtypes.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/quota.h b/9/platforms/android-21/arch-mips64/usr/include/linux/quota.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/quota.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/quota.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/radeonfb.h b/9/platforms/android-21/arch-mips64/usr/include/linux/radeonfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/radeonfb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/radeonfb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/raid/md_p.h b/9/platforms/android-21/arch-mips64/usr/include/linux/raid/md_p.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/raid/md_p.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/raid/md_p.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/raid/md_u.h b/9/platforms/android-21/arch-mips64/usr/include/linux/raid/md_u.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/raid/md_u.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/raid/md_u.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/random.h b/9/platforms/android-21/arch-mips64/usr/include/linux/random.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/random.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/random.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/raw.h b/9/platforms/android-21/arch-mips64/usr/include/linux/raw.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/raw.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/raw.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/rds.h b/9/platforms/android-21/arch-mips64/usr/include/linux/rds.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/rds.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/rds.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/reboot.h b/9/platforms/android-21/arch-mips64/usr/include/linux/reboot.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/reboot.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/reboot.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/reiserfs_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/reiserfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/reiserfs_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/reiserfs_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/reiserfs_xattr.h b/9/platforms/android-21/arch-mips64/usr/include/linux/reiserfs_xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/reiserfs_xattr.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/reiserfs_xattr.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/resource.h b/9/platforms/android-21/arch-mips64/usr/include/linux/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/resource.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/resource.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/rfkill.h b/9/platforms/android-21/arch-mips64/usr/include/linux/rfkill.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/rfkill.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/rfkill.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/romfs_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/romfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/romfs_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/romfs_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/rose.h b/9/platforms/android-21/arch-mips64/usr/include/linux/rose.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/rose.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/rose.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/route.h b/9/platforms/android-21/arch-mips64/usr/include/linux/route.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/route.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/route.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/rtc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/rtc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/rtc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/rtc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/rtnetlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/rtnetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/rtnetlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/rtnetlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/scc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/scc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/scc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/scc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sched.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sched.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sched.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/screen_info.h b/9/platforms/android-21/arch-mips64/usr/include/linux/screen_info.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/screen_info.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/screen_info.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sctp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sctp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sctp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sdla.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sdla.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sdla.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sdla.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/seccomp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/seccomp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/seccomp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/seccomp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/securebits.h b/9/platforms/android-21/arch-mips64/usr/include/linux/securebits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/securebits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/securebits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/selinux_netlink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/selinux_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/selinux_netlink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/selinux_netlink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sem.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sem.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sem.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sem.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/serial.h b/9/platforms/android-21/arch-mips64/usr/include/linux/serial.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/serial.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/serial.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/serial_core.h b/9/platforms/android-21/arch-mips64/usr/include/linux/serial_core.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/serial_core.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/serial_core.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/serial_reg.h b/9/platforms/android-21/arch-mips64/usr/include/linux/serial_reg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/serial_reg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/serial_reg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/serio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/serio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/serio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/serio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/shm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/shm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/shm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/shm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/signal.h b/9/platforms/android-21/arch-mips64/usr/include/linux/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/signal.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/signal.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/signalfd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/signalfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/signalfd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/signalfd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/snmp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/snmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/snmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/snmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sock_diag.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sock_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sock_diag.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sock_diag.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/socket.h b/9/platforms/android-21/arch-mips64/usr/include/linux/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/socket.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sockios.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sockios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sockios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/som.h b/9/platforms/android-21/arch-mips64/usr/include/linux/som.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/som.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/som.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sonet.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sonet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sonet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sonypi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sonypi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sonypi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sonypi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sound.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sound.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sound.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sound.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/soundcard.h b/9/platforms/android-21/arch-mips64/usr/include/linux/soundcard.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/soundcard.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/soundcard.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/spi/spidev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/spi/spidev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/spi/spidev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/spi/spidev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/stat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/stat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/stat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/stddef.h b/9/platforms/android-21/arch-mips64/usr/include/linux/stddef.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/stddef.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/stddef.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/string.h b/9/platforms/android-21/arch-mips64/usr/include/linux/string.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/string.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/string.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sunrpc/debug.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sunrpc/debug.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sunrpc/debug.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sunrpc/debug.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/suspend_ioctls.h b/9/platforms/android-21/arch-mips64/usr/include/linux/suspend_ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/suspend_ioctls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/suspend_ioctls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sw_sync.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sw_sync.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sw_sync.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sw_sync.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/swab.h b/9/platforms/android-21/arch-mips64/usr/include/linux/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/swab.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/swab.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sync.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sync.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sync.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sync.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/synclink.h b/9/platforms/android-21/arch-mips64/usr/include/linux/synclink.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/synclink.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/synclink.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sysctl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sysctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sysctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sysctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/sysinfo.h b/9/platforms/android-21/arch-mips64/usr/include/linux/sysinfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/sysinfo.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/sysinfo.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/taskstats.h b/9/platforms/android-21/arch-mips64/usr/include/linux/taskstats.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/taskstats.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/taskstats.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_csum.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_csum.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_csum.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_csum.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_defact.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_defact.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_defact.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_defact.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_gact.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_gact.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_gact.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_gact.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_ipt.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_ipt.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_ipt.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_ipt.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_mirred.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_mirred.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_mirred.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_mirred.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_nat.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_nat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_nat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_pedit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_pedit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_pedit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_pedit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_skbedit.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_skbedit.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_act/tc_skbedit.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_act/tc_skbedit.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_cmp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_cmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_meta.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_meta.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_meta.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_nbyte.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_nbyte.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_text.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tc_ematch/tc_em_text.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tc_ematch/tc_em_text.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tcp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tcp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tcp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tcp_metrics.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tcp_metrics.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tcp_metrics.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tcp_metrics.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/telephony.h b/9/platforms/android-21/arch-mips64/usr/include/linux/telephony.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/telephony.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/telephony.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/termios.h b/9/platforms/android-21/arch-mips64/usr/include/linux/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/termios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/termios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/time.h b/9/platforms/android-21/arch-mips64/usr/include/linux/time.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/time.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/time.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/times.h b/9/platforms/android-21/arch-mips64/usr/include/linux/times.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/times.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/times.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/timex.h b/9/platforms/android-21/arch-mips64/usr/include/linux/timex.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/timex.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/timex.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tiocl.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tiocl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tiocl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tiocl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tipc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tipc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tipc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tipc_config.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tipc_config.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tipc_config.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tipc_config.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/toshiba.h b/9/platforms/android-21/arch-mips64/usr/include/linux/toshiba.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/toshiba.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/toshiba.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tty.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tty.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tty.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tty.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/tty_flags.h b/9/platforms/android-21/arch-mips64/usr/include/linux/tty_flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/tty_flags.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/tty_flags.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/types.h b/9/platforms/android-21/arch-mips64/usr/include/linux/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/udf_fs_i.h b/9/platforms/android-21/arch-mips64/usr/include/linux/udf_fs_i.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/udf_fs_i.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/udf_fs_i.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/udp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/udp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/udp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/udp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/uhid.h b/9/platforms/android-21/arch-mips64/usr/include/linux/uhid.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/uhid.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/uhid.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/uinput.h b/9/platforms/android-21/arch-mips64/usr/include/linux/uinput.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/uinput.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/uinput.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/uio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/uio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/uio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/uio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/ultrasound.h b/9/platforms/android-21/arch-mips64/usr/include/linux/ultrasound.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/ultrasound.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/ultrasound.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/un.h b/9/platforms/android-21/arch-mips64/usr/include/linux/un.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/un.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/un.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/unistd.h b/9/platforms/android-21/arch-mips64/usr/include/linux/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/unistd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/unistd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/unix_diag.h b/9/platforms/android-21/arch-mips64/usr/include/linux/unix_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/unix_diag.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/unix_diag.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/audio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/audio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/audio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/audio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/cdc-wdm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/cdc-wdm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/cdc-wdm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/cdc-wdm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/cdc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/cdc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/cdc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/cdc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/ch11.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/ch11.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/ch11.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/ch11.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/ch9.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/ch9.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/ch9.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/ch9.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/f_accessory.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/f_accessory.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/f_accessory.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/f_accessory.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/f_mtp.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/f_mtp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/f_mtp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/f_mtp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/functionfs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/functionfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/functionfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/functionfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/g_printer.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/g_printer.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/g_printer.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/g_printer.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/gadgetfs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/gadgetfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/gadgetfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/gadgetfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/midi.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/midi.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/midi.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/midi.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/tmc.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/tmc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/tmc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/tmc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usb/video.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usb/video.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usb/video.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usb/video.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/usbdevice_fs.h b/9/platforms/android-21/arch-mips64/usr/include/linux/usbdevice_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/usbdevice_fs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/usbdevice_fs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/utime.h b/9/platforms/android-21/arch-mips64/usr/include/linux/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/utime.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/utime.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/utsname.h b/9/platforms/android-21/arch-mips64/usr/include/linux/utsname.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/utsname.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/utsname.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/uuid.h b/9/platforms/android-21/arch-mips64/usr/include/linux/uuid.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/uuid.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/uuid.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/uvcvideo.h b/9/platforms/android-21/arch-mips64/usr/include/linux/uvcvideo.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/uvcvideo.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/uvcvideo.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-common.h b/9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-common.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-common.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-common.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-controls.h b/9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-controls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-controls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-controls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-dv-timings.h b/9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-dv-timings.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-dv-timings.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-dv-timings.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-mediabus.h b/9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-mediabus.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-mediabus.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-mediabus.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-subdev.h b/9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-subdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/v4l2-subdev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/v4l2-subdev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/version.h b/9/platforms/android-21/arch-mips64/usr/include/linux/version.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/version.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/version.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/veth.h b/9/platforms/android-21/arch-mips64/usr/include/linux/veth.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/veth.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/veth.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/vfio.h b/9/platforms/android-21/arch-mips64/usr/include/linux/vfio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/vfio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/vfio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/vhost.h b/9/platforms/android-21/arch-mips64/usr/include/linux/vhost.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/vhost.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/vhost.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/videodev2.h b/9/platforms/android-21/arch-mips64/usr/include/linux/videodev2.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/videodev2.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/videodev2.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_9p.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_9p.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_9p.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_9p.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_balloon.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_balloon.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_balloon.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_balloon.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_blk.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_blk.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_blk.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_blk.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_config.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_config.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_config.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_config.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_console.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_console.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_console.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_console.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_ids.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_ids.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_ids.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_ids.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_net.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_net.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_net.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_net.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_pci.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_pci.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_pci.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_pci.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_ring.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_ring.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_ring.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_ring.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/virtio_rng.h b/9/platforms/android-21/arch-mips64/usr/include/linux/virtio_rng.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/virtio_rng.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/virtio_rng.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/vm_sockets.h b/9/platforms/android-21/arch-mips64/usr/include/linux/vm_sockets.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/vm_sockets.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/vm_sockets.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/vsp1.h b/9/platforms/android-21/arch-mips64/usr/include/linux/vsp1.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/vsp1.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/vsp1.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/vt.h b/9/platforms/android-21/arch-mips64/usr/include/linux/vt.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/vt.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/vt.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/wait.h b/9/platforms/android-21/arch-mips64/usr/include/linux/wait.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/wait.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/wait.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/wanrouter.h b/9/platforms/android-21/arch-mips64/usr/include/linux/wanrouter.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/wanrouter.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/wanrouter.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/watchdog.h b/9/platforms/android-21/arch-mips64/usr/include/linux/watchdog.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/watchdog.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/watchdog.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/wimax.h b/9/platforms/android-21/arch-mips64/usr/include/linux/wimax.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/wimax.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/wimax.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/wimax/i2400m.h b/9/platforms/android-21/arch-mips64/usr/include/linux/wimax/i2400m.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/wimax/i2400m.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/wimax/i2400m.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/wireless.h b/9/platforms/android-21/arch-mips64/usr/include/linux/wireless.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/wireless.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/wireless.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/x25.h b/9/platforms/android-21/arch-mips64/usr/include/linux/x25.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/x25.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/x25.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/xattr.h b/9/platforms/android-21/arch-mips64/usr/include/linux/xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/xattr.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/xattr.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/xfrm.h b/9/platforms/android-21/arch-mips64/usr/include/linux/xfrm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/xfrm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/xfrm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/zorro.h b/9/platforms/android-21/arch-mips64/usr/include/linux/zorro.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/zorro.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/zorro.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/linux/zorro_ids.h b/9/platforms/android-21/arch-mips64/usr/include/linux/zorro_ids.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/linux/zorro_ids.h
rename to 9/platforms/android-21/arch-mips64/usr/include/linux/zorro_ids.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/locale.h b/9/platforms/android-21/arch-mips64/usr/include/locale.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/locale.h
rename to 9/platforms/android-21/arch-mips64/usr/include/locale.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/asm.h b/9/platforms/android-21/arch-mips64/usr/include/machine/asm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/asm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/asm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/elf_machdep.h b/9/platforms/android-21/arch-mips64/usr/include/machine/elf_machdep.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/elf_machdep.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/elf_machdep.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/endian.h b/9/platforms/android-21/arch-mips64/usr/include/machine/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/endian.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/endian.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/exec.h b/9/platforms/android-21/arch-mips64/usr/include/machine/exec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/exec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/exec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/fenv.h b/9/platforms/android-21/arch-mips64/usr/include/machine/fenv.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/fenv.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/fenv.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/ieee.h b/9/platforms/android-21/arch-mips64/usr/include/machine/ieee.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/ieee.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/ieee.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/regdef.h b/9/platforms/android-21/arch-mips64/usr/include/machine/regdef.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/regdef.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/regdef.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/regnum.h b/9/platforms/android-21/arch-mips64/usr/include/machine/regnum.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/regnum.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/regnum.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/setjmp.h b/9/platforms/android-21/arch-mips64/usr/include/machine/setjmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/setjmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/setjmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/signal.h b/9/platforms/android-21/arch-mips64/usr/include/machine/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/signal.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/signal.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/machine/wchar_limits.h b/9/platforms/android-21/arch-mips64/usr/include/machine/wchar_limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/machine/wchar_limits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/machine/wchar_limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/malloc.h b/9/platforms/android-21/arch-mips64/usr/include/malloc.h
similarity index 85%
copy from 9/platforms/android-19/arch-arm64/usr/include/malloc.h
copy to 9/platforms/android-21/arch-mips64/usr/include/malloc.h
index 1e92b7d..e6ea276 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/malloc.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/malloc.h
@@ -27,19 +27,12 @@
 
 __BEGIN_DECLS
 
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
 extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
 extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
 extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
 extern void free(void* p);
+
+extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
 #ifndef STRUCT_MALLINFO_DECLARED
diff --git a/9/platforms/android-19/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-mips64/usr/include/math.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/math.h
copy to 9/platforms/android-21/arch-mips64/usr/include/math.h
index 8369d6e..e872388 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/math.h
@@ -512,7 +512,8 @@
 double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
 double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
 int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
+/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
 int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaCodec.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaCodec.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaCodec.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaCodec.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaCrypto.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaCrypto.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaCrypto.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaCrypto.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaDrm.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaDrm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaDrm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaDrm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaError.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaError.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaError.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaError.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaExtractor.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaExtractor.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaExtractor.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaExtractor.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaFormat.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaFormat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaFormat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaFormat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaMuxer.h b/9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaMuxer.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/media/NdkMediaMuxer.h
rename to 9/platforms/android-21/arch-mips64/usr/include/media/NdkMediaMuxer.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/memory.h b/9/platforms/android-21/arch-mips64/usr/include/memory.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/memory.h
rename to 9/platforms/android-21/arch-mips64/usr/include/memory.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/mntent.h b/9/platforms/android-21/arch-mips64/usr/include/mntent.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/mntent.h
rename to 9/platforms/android-21/arch-mips64/usr/include/mntent.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/ethernet.h b/9/platforms/android-21/arch-mips64/usr/include/net/ethernet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/ethernet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/ethernet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/ethertypes.h b/9/platforms/android-21/arch-mips64/usr/include/net/ethertypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/ethertypes.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/ethertypes.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/if.h b/9/platforms/android-21/arch-mips64/usr/include/net/if.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/if.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/if.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/if_arp.h b/9/platforms/android-21/arch-mips64/usr/include/net/if_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/if_arp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/if_arp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/if_ether.h b/9/platforms/android-21/arch-mips64/usr/include/net/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/if_ether.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/if_ether.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/if_ieee1394.h b/9/platforms/android-21/arch-mips64/usr/include/net/if_ieee1394.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/if_ieee1394.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/if_ieee1394.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/if_packet.h b/9/platforms/android-21/arch-mips64/usr/include/net/if_packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/if_packet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/if_packet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/if_types.h b/9/platforms/android-21/arch-mips64/usr/include/net/if_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/if_types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/if_types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/net/route.h b/9/platforms/android-21/arch-mips64/usr/include/net/route.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/net/route.h
rename to 9/platforms/android-21/arch-mips64/usr/include/net/route.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netdb.h b/9/platforms/android-21/arch-mips64/usr/include/netdb.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netdb.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netdb.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/ether.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/ether.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/ether.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/icmp6.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/icmp6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/icmp6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/icmp6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/if_ether.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/if_ether.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/if_ether.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/in.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/in.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/in.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/in.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/in6.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/in6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/in6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/in6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/in_systm.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/in_systm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/in_systm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/in_systm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/ip.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/ip.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/ip.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/ip6.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/ip6.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/ip6.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/ip6.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/ip_icmp.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/ip_icmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/ip_icmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/ip_icmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/tcp.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/tcp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/tcp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netinet/udp.h b/9/platforms/android-21/arch-mips64/usr/include/netinet/udp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netinet/udp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netinet/udp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/netpacket/packet.h b/9/platforms/android-21/arch-mips64/usr/include/netpacket/packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/netpacket/packet.h
rename to 9/platforms/android-21/arch-mips64/usr/include/netpacket/packet.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/nsswitch.h b/9/platforms/android-21/arch-mips64/usr/include/nsswitch.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/nsswitch.h
rename to 9/platforms/android-21/arch-mips64/usr/include/nsswitch.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/pathconf.h b/9/platforms/android-21/arch-mips64/usr/include/pathconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/pathconf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/pathconf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/paths.h b/9/platforms/android-21/arch-mips64/usr/include/paths.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/paths.h
rename to 9/platforms/android-21/arch-mips64/usr/include/paths.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/poll.h b/9/platforms/android-21/arch-mips64/usr/include/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/poll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/poll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/pthread.h b/9/platforms/android-21/arch-mips64/usr/include/pthread.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/pthread.h
rename to 9/platforms/android-21/arch-mips64/usr/include/pthread.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/pwd.h b/9/platforms/android-21/arch-mips64/usr/include/pwd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/pwd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/pwd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/regex.h b/9/platforms/android-21/arch-mips64/usr/include/regex.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/regex.h
rename to 9/platforms/android-21/arch-mips64/usr/include/regex.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/resolv.h b/9/platforms/android-21/arch-mips64/usr/include/resolv.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/resolv.h
rename to 9/platforms/android-21/arch-mips64/usr/include/resolv.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sched.h b/9/platforms/android-21/arch-mips64/usr/include/sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sched.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sched.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/search.h b/9/platforms/android-21/arch-mips64/usr/include/search.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/search.h
rename to 9/platforms/android-21/arch-mips64/usr/include/search.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/semaphore.h b/9/platforms/android-21/arch-mips64/usr/include/semaphore.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/semaphore.h
rename to 9/platforms/android-21/arch-mips64/usr/include/semaphore.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/setjmp.h b/9/platforms/android-21/arch-mips64/usr/include/setjmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/setjmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/setjmp.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sgidefs.h b/9/platforms/android-21/arch-mips64/usr/include/sgidefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sgidefs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sgidefs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sgtty.h b/9/platforms/android-21/arch-mips64/usr/include/sgtty.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sgtty.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sgtty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/signal.h b/9/platforms/android-21/arch-mips64/usr/include/signal.h
similarity index 98%
copy from 9/platforms/android-19/arch-arm64/usr/include/signal.h
copy to 9/platforms/android-21/arch-mips64/usr/include/signal.h
index f1849c5..e23e65b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/signal.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
copy to 9/platforms/android-21/arch-mips64/usr/include/stdatomic.h
index 3db25a7..58cb1bc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
@@ -89,6 +89,7 @@
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_consume;
+using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
diff --git a/9/platforms/android-19/arch-mips64/usr/include/stdint.h b/9/platforms/android-21/arch-mips64/usr/include/stdint.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/stdint.h
rename to 9/platforms/android-21/arch-mips64/usr/include/stdint.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/stdio.h b/9/platforms/android-21/arch-mips64/usr/include/stdio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/stdio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/stdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-21/arch-mips64/usr/include/stdlib.h
similarity index 96%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdlib.h
copy to 9/platforms/android-21/arch-mips64/usr/include/stdlib.h
index a0f017c..e04475c 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/stdlib.h
@@ -76,8 +76,8 @@
 extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
 
 extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
+extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
+extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
 
 extern int atoi(const char*) __purefunc;
 extern long atol(const char*) __purefunc;
diff --git a/9/platforms/android-19/arch-mips64/usr/include/string.h b/9/platforms/android-21/arch-mips64/usr/include/string.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/string.h
rename to 9/platforms/android-21/arch-mips64/usr/include/string.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/strings.h b/9/platforms/android-21/arch-mips64/usr/include/strings.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/strings.h
rename to 9/platforms/android-21/arch-mips64/usr/include/strings.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/auxv.h b/9/platforms/android-21/arch-mips64/usr/include/sys/auxv.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/auxv.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/auxv.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/cachectl.h b/9/platforms/android-21/arch-mips64/usr/include/sys/cachectl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/cachectl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/cachectl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/capability.h b/9/platforms/android-21/arch-mips64/usr/include/sys/capability.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/capability.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/capability.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/cdefs.h b/9/platforms/android-21/arch-mips64/usr/include/sys/cdefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/cdefs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/cdefs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/cdefs_elf.h b/9/platforms/android-21/arch-mips64/usr/include/sys/cdefs_elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/cdefs_elf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/cdefs_elf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/endian.h b/9/platforms/android-21/arch-mips64/usr/include/sys/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/endian.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/endian.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/epoll.h b/9/platforms/android-21/arch-mips64/usr/include/sys/epoll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/epoll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/epoll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/errno.h b/9/platforms/android-21/arch-mips64/usr/include/sys/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/errno.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/errno.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/eventfd.h b/9/platforms/android-21/arch-mips64/usr/include/sys/eventfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/eventfd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/eventfd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/file.h b/9/platforms/android-21/arch-mips64/usr/include/sys/file.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/file.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/file.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/fsuid.h b/9/platforms/android-21/arch-mips64/usr/include/sys/fsuid.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/fsuid.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/fsuid.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/glibc-syscalls.h b/9/platforms/android-21/arch-mips64/usr/include/sys/glibc-syscalls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/glibc-syscalls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/glibc-syscalls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/inotify.h b/9/platforms/android-21/arch-mips64/usr/include/sys/inotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/inotify.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/inotify.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ioctl.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ioctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ioctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ioctl_compat.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ioctl_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ioctl_compat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ioctl_compat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ipc.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ipc.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ipc.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/klog.h b/9/platforms/android-21/arch-mips64/usr/include/sys/klog.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/klog.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/klog.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/limits.h b/9/platforms/android-21/arch-mips64/usr/include/sys/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/limits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/limits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/mman.h b/9/platforms/android-21/arch-mips64/usr/include/sys/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/mman.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/mman.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/mount.h b/9/platforms/android-21/arch-mips64/usr/include/sys/mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/mount.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/mount.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/msg.h b/9/platforms/android-21/arch-mips64/usr/include/sys/msg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/msg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/msg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/param.h b/9/platforms/android-21/arch-mips64/usr/include/sys/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/param.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/param.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/personality.h b/9/platforms/android-21/arch-mips64/usr/include/sys/personality.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/personality.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/personality.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/poll.h b/9/platforms/android-21/arch-mips64/usr/include/sys/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/poll.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/poll.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/prctl.h b/9/platforms/android-21/arch-mips64/usr/include/sys/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/prctl.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/prctl.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ptrace.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ptrace.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ptrace.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/queue.h b/9/platforms/android-21/arch-mips64/usr/include/sys/queue.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/queue.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/queue.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/reboot.h b/9/platforms/android-21/arch-mips64/usr/include/sys/reboot.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/reboot.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/reboot.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/reg.h b/9/platforms/android-21/arch-mips64/usr/include/sys/reg.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/reg.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/reg.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/resource.h b/9/platforms/android-21/arch-mips64/usr/include/sys/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/resource.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/resource.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/select.h b/9/platforms/android-21/arch-mips64/usr/include/sys/select.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/select.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/select.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/sem.h b/9/platforms/android-21/arch-mips64/usr/include/sys/sem.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/sem.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/sem.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/sendfile.h b/9/platforms/android-21/arch-mips64/usr/include/sys/sendfile.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/sendfile.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/sendfile.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/shm.h b/9/platforms/android-21/arch-mips64/usr/include/sys/shm.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/shm.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/shm.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/signal.h b/9/platforms/android-21/arch-mips64/usr/include/sys/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/signal.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/signal.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/signalfd.h b/9/platforms/android-21/arch-mips64/usr/include/sys/signalfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/signalfd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/signalfd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/socket.h b/9/platforms/android-21/arch-mips64/usr/include/sys/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/socket.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/socket.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/socketcalls.h b/9/platforms/android-21/arch-mips64/usr/include/sys/socketcalls.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/socketcalls.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/socketcalls.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/stat.h b/9/platforms/android-21/arch-mips64/usr/include/sys/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/stat.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/stat.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/statfs.h b/9/platforms/android-21/arch-mips64/usr/include/sys/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/statfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/statfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h b/9/platforms/android-21/arch-mips64/usr/include/sys/statvfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/statvfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/statvfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/swap.h b/9/platforms/android-21/arch-mips64/usr/include/sys/swap.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/swap.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/swap.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/syscall.h b/9/platforms/android-21/arch-mips64/usr/include/sys/syscall.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/syscall.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/syscall.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/sysconf.h b/9/platforms/android-21/arch-mips64/usr/include/sys/sysconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/sysconf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/sysconf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/sysinfo.h b/9/platforms/android-21/arch-mips64/usr/include/sys/sysinfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/sysinfo.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/sysinfo.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/syslimits.h b/9/platforms/android-21/arch-mips64/usr/include/sys/syslimits.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/syslimits.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/syslimits.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/sysmacros.h b/9/platforms/android-21/arch-mips64/usr/include/sys/sysmacros.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/sysmacros.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/sysmacros.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/system_properties.h b/9/platforms/android-21/arch-mips64/usr/include/sys/system_properties.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/system_properties.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/system_properties.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/time.h b/9/platforms/android-21/arch-mips64/usr/include/sys/time.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/time.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/time.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/timerfd.h b/9/platforms/android-21/arch-mips64/usr/include/sys/timerfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/timerfd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/timerfd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/times.h b/9/platforms/android-21/arch-mips64/usr/include/sys/times.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/times.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/times.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/timex.h b/9/platforms/android-21/arch-mips64/usr/include/sys/timex.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/timex.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/timex.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ttychars.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ttychars.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ttychars.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ttychars.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ttydefaults.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ttydefaults.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ttydefaults.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ttydefaults.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ttydev.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ttydev.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ttydev.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ttydev.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/types.h b/9/platforms/android-21/arch-mips64/usr/include/sys/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/types.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/types.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-mips64/usr/include/sys/ucontext.h
similarity index 96%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/ucontext.h
index f62380d..dd2a0bb 100644
--- a/9/platforms/android-19/arch-mips64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -80,6 +78,10 @@
 
 #elif defined(__aarch64__)
 
+#define NGREG 34 /* x0..x30 + sp + pc + pstate */
+typedef unsigned long greg_t;
+typedef greg_t gregset_t[NGREG];
+
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -152,11 +154,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/uio.h b/9/platforms/android-21/arch-mips64/usr/include/sys/uio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/uio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/uio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/un.h b/9/platforms/android-21/arch-mips64/usr/include/sys/un.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/un.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/un.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/user.h b/9/platforms/android-21/arch-mips64/usr/include/sys/user.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/user.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/user.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/utime.h b/9/platforms/android-21/arch-mips64/usr/include/sys/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/utime.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/utime.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/utsname.h b/9/platforms/android-21/arch-mips64/usr/include/sys/utsname.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/utsname.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/utsname.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h b/9/platforms/android-21/arch-mips64/usr/include/sys/vfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/vfs.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/vfs.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/vt.h b/9/platforms/android-21/arch-mips64/usr/include/sys/vt.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/vt.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/vt.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/wait.h b/9/platforms/android-21/arch-mips64/usr/include/sys/wait.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/wait.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/wait.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/sys/xattr.h b/9/platforms/android-21/arch-mips64/usr/include/sys/xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/sys/xattr.h
rename to 9/platforms/android-21/arch-mips64/usr/include/sys/xattr.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/syslog.h b/9/platforms/android-21/arch-mips64/usr/include/syslog.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/syslog.h
rename to 9/platforms/android-21/arch-mips64/usr/include/syslog.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/termio.h b/9/platforms/android-21/arch-mips64/usr/include/termio.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/termio.h
rename to 9/platforms/android-21/arch-mips64/usr/include/termio.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/termios.h b/9/platforms/android-21/arch-mips64/usr/include/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/termios.h
rename to 9/platforms/android-21/arch-mips64/usr/include/termios.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/thread_db.h b/9/platforms/android-21/arch-mips64/usr/include/thread_db.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/thread_db.h
rename to 9/platforms/android-21/arch-mips64/usr/include/thread_db.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time.h b/9/platforms/android-21/arch-mips64/usr/include/time.h
similarity index 91%
copy from 9/platforms/android-19/arch-arm64/usr/include/time.h
copy to 9/platforms/android-21/arch-mips64/usr/include/time.h
index 0a5f18b..aa72fcc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/time.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/time.h
@@ -85,8 +85,10 @@
 
 extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
 
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__;
 
 extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
 extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
diff --git a/9/platforms/android-19/arch-mips64/usr/include/time64.h b/9/platforms/android-21/arch-mips64/usr/include/time64.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/time64.h
rename to 9/platforms/android-21/arch-mips64/usr/include/time64.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/uchar.h b/9/platforms/android-21/arch-mips64/usr/include/uchar.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/uchar.h
rename to 9/platforms/android-21/arch-mips64/usr/include/uchar.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/ucontext.h b/9/platforms/android-21/arch-mips64/usr/include/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/ucontext.h
rename to 9/platforms/android-21/arch-mips64/usr/include/ucontext.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/unistd.h b/9/platforms/android-21/arch-mips64/usr/include/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/unistd.h
rename to 9/platforms/android-21/arch-mips64/usr/include/unistd.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/util.h b/9/platforms/android-21/arch-mips64/usr/include/util.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/util.h
rename to 9/platforms/android-21/arch-mips64/usr/include/util.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/utime.h b/9/platforms/android-21/arch-mips64/usr/include/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/utime.h
rename to 9/platforms/android-21/arch-mips64/usr/include/utime.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/utmp.h b/9/platforms/android-21/arch-mips64/usr/include/utmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/utmp.h
rename to 9/platforms/android-21/arch-mips64/usr/include/utmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-21/arch-mips64/usr/include/wchar.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/wchar.h
copy to 9/platforms/android-21/arch-mips64/usr/include/wchar.h
index f421d4c..cfa9b74 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-21/arch-mips64/usr/include/wchar.h
@@ -151,8 +151,8 @@
 extern int               wprintf(const wchar_t *, ...);
 extern int               wscanf(const wchar_t *, ...);
 
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
+extern long long          wcstoll_l(const wchar_t *, wchar_t **, int, locale_t);
+extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t);
 extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
 
 extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
diff --git a/9/platforms/android-19/arch-mips64/usr/include/wctype.h b/9/platforms/android-21/arch-mips64/usr/include/wctype.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/wctype.h
rename to 9/platforms/android-21/arch-mips64/usr/include/wctype.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/xlocale.h b/9/platforms/android-21/arch-mips64/usr/include/xlocale.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/xlocale.h
rename to 9/platforms/android-21/arch-mips64/usr/include/xlocale.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/zconf.h b/9/platforms/android-21/arch-mips64/usr/include/zconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/zconf.h
rename to 9/platforms/android-21/arch-mips64/usr/include/zconf.h
diff --git a/9/platforms/android-19/arch-mips64/usr/include/zlib.h b/9/platforms/android-21/arch-mips64/usr/include/zlib.h
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/include/zlib.h
rename to 9/platforms/android-21/arch-mips64/usr/include/zlib.h
diff --git a/9/platforms/android-19/arch-mips64/usr/lib b/9/platforms/android-21/arch-mips64/usr/lib
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/lib
rename to 9/platforms/android-21/arch-mips64/usr/lib
diff --git a/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_dynamic.o b/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_dynamic.o
new file mode 100644
index 0000000..b4e8012
--- /dev/null
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_so.o b/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_so.o
new file mode 100644
index 0000000..688b150
--- /dev/null
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_static.o b/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_static.o
new file mode 100644
index 0000000..b4e8012
--- /dev/null
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/crtend_android.o b/9/platforms/android-21/arch-mips64/usr/lib64/crtend_android.o
similarity index 96%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/crtend_android.o
rename to 9/platforms/android-21/arch-mips64/usr/lib64/crtend_android.o
index 416acd7..5844c05 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib64/crtend_android.o
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/crtend_so.o b/9/platforms/android-21/arch-mips64/usr/lib64/crtend_so.o
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/crtend_so.o
rename to 9/platforms/android-21/arch-mips64/usr/lib64/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libEGL.so b/9/platforms/android-21/arch-mips64/usr/lib64/libEGL.so
similarity index 76%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libEGL.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libEGL.so
index b812ada..1bf2768 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libEGL.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libEGL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libGLESv1_CM.so b/9/platforms/android-21/arch-mips64/usr/lib64/libGLESv1_CM.so
similarity index 74%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libGLESv1_CM.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libGLESv1_CM.so
index cbbd319..aa2f6c8 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libGLESv1_CM.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libGLESv2.so b/9/platforms/android-21/arch-mips64/usr/lib64/libGLESv2.so
similarity index 73%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libGLESv2.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libGLESv2.so
index a965a88..b40b156 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libGLESv2.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libGLESv3.so b/9/platforms/android-21/arch-mips64/usr/lib64/libGLESv3.so
similarity index 73%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libGLESv3.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libGLESv3.so
index 01e4a94..452a0ec 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libGLESv3.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libOpenMAXAL.so b/9/platforms/android-21/arch-mips64/usr/lib64/libOpenMAXAL.so
similarity index 66%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libOpenMAXAL.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libOpenMAXAL.so
index 78d6a06..304b72c 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libOpenMAXAL.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libOpenSLES.so b/9/platforms/android-21/arch-mips64/usr/lib64/libOpenSLES.so
similarity index 65%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libOpenSLES.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libOpenSLES.so
index 8987906..78b8541 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libOpenSLES.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libandroid.so b/9/platforms/android-21/arch-mips64/usr/lib64/libandroid.so
similarity index 71%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libandroid.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libandroid.so
index dcb1f15..6f37524 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libandroid.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libandroid.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libc.a b/9/platforms/android-21/arch-mips64/usr/lib64/libc.a
similarity index 100%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libc.a
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-mips64/usr/lib64/libc.so b/9/platforms/android-21/arch-mips64/usr/lib64/libc.so
new file mode 100755
index 0000000..3c68584
--- /dev/null
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libc.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libdl.so b/9/platforms/android-21/arch-mips64/usr/lib64/libdl.so
similarity index 79%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libdl.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libdl.so
index c36f31b..385266f 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libdl.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libdl.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libjnigraphics.so b/9/platforms/android-21/arch-mips64/usr/lib64/libjnigraphics.so
similarity index 80%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libjnigraphics.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libjnigraphics.so
index 442befd..6533c37 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libjnigraphics.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/liblog.so b/9/platforms/android-21/arch-mips64/usr/lib64/liblog.so
similarity index 78%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/liblog.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/liblog.so
index 64bdbe5..0ec7a85 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/liblog.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/liblog.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libm.a b/9/platforms/android-21/arch-mips64/usr/lib64/libm.a
similarity index 99%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libm.a
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libm.a
index 5e847b5..54ae7d2 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libm.a
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libm.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libm.so b/9/platforms/android-21/arch-mips64/usr/lib64/libm.so
similarity index 76%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libm.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libm.so
index b89bcb6..d4f1595 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libm.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libm.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libmediandk.so b/9/platforms/android-21/arch-mips64/usr/lib64/libmediandk.so
similarity index 70%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libmediandk.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libmediandk.so
index 377373b..754f275 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libmediandk.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libstdc++.a b/9/platforms/android-21/arch-mips64/usr/lib64/libstdc++.a
similarity index 99%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libstdc++.a
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libstdc++.a
index 40105c0..a64f2cf 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libstdc++.a
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libstdc++.so b/9/platforms/android-21/arch-mips64/usr/lib64/libstdc++.so
similarity index 78%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libstdc++.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libstdc++.so
index 4747f52..5b0283e 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libstdc++.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libz.a b/9/platforms/android-21/arch-mips64/usr/lib64/libz.a
similarity index 99%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libz.a
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libz.a
index 8e658fa..ba98a5f 100644
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libz.a
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libz.a
Binary files differ
diff --git a/9/platforms/android-19/arch-mips64/usr/lib64/libz.so b/9/platforms/android-21/arch-mips64/usr/lib64/libz.so
similarity index 75%
rename from 9/platforms/android-19/arch-mips64/usr/lib64/libz.so
rename to 9/platforms/android-21/arch-mips64/usr/lib64/libz.so
index 9f989c4..4bee9fe 100755
--- a/9/platforms/android-19/arch-mips64/usr/lib64/libz.so
+++ b/9/platforms/android-21/arch-mips64/usr/lib64/libz.so
Binary files differ
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h b/9/platforms/android-21/arch-x86/usr/include/EGL/egl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/egl.h
copy to 9/platforms/android-21/arch-x86/usr/include/EGL/egl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h b/9/platforms/android-21/arch-x86/usr/include/EGL/eglext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglext.h
copy to 9/platforms/android-21/arch-x86/usr/include/EGL/eglext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h b/9/platforms/android-21/arch-x86/usr/include/EGL/eglplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/EGL/eglplatform.h
copy to 9/platforms/android-21/arch-x86/usr/include/EGL/eglplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h b/9/platforms/android-21/arch-x86/usr/include/GLES/gl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/gl.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES/gl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h b/9/platforms/android-21/arch-x86/usr/include/GLES/glext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/glext.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES/glext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h b/9/platforms/android-21/arch-x86/usr/include/GLES/glplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES/glplatform.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES/glplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h b/9/platforms/android-21/arch-x86/usr/include/GLES2/gl2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES2/gl2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h b/9/platforms/android-21/arch-x86/usr/include/GLES2/gl2ext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2ext.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES2/gl2ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h b/9/platforms/android-21/arch-x86/usr/include/GLES2/gl2platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES2/gl2platform.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES2/gl2platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h b/9/platforms/android-21/arch-x86/usr/include/GLES3/gl3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES3/gl3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h b/9/platforms/android-21/arch-x86/usr/include/GLES3/gl31.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl31.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES3/gl31.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h b/9/platforms/android-21/arch-x86/usr/include/GLES3/gl3ext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3ext.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES3/gl3ext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h b/9/platforms/android-21/arch-x86/usr/include/GLES3/gl3platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/GLES3/gl3platform.h
copy to 9/platforms/android-21/arch-x86/usr/include/GLES3/gl3platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h b/9/platforms/android-21/arch-x86/usr/include/KHR/khrplatform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/KHR/khrplatform.h
copy to 9/platforms/android-21/arch-x86/usr/include/KHR/khrplatform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h b/9/platforms/android-21/arch-x86/usr/include/OMXAL/OpenMAXAL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL.h
copy to 9/platforms/android-21/arch-x86/usr/include/OMXAL/OpenMAXAL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-21/arch-x86/usr/include/OMXAL/OpenMAXAL_Android.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Android.h
copy to 9/platforms/android-21/arch-x86/usr/include/OMXAL/OpenMAXAL_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h b/9/platforms/android-21/arch-x86/usr/include/OMXAL/OpenMAXAL_Platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/OMXAL/OpenMAXAL_Platform.h
copy to 9/platforms/android-21/arch-x86/usr/include/OMXAL/OpenMAXAL_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h b/9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES.h
copy to 9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_Android.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Android.h
copy to 9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_Android.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h b/9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
copy to 9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h b/9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_AndroidMetadata.h
copy to 9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h b/9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_Platform.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/SLES/OpenSLES_Platform.h
copy to 9/platforms/android-21/arch-x86/usr/include/SLES/OpenSLES_Platform.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/alloca.h b/9/platforms/android-21/arch-x86/usr/include/alloca.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/alloca.h
copy to 9/platforms/android-21/arch-x86/usr/include/alloca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h b/9/platforms/android-21/arch-x86/usr/include/android/api-level.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/api-level.h
index 9e9c3d6..649efd6 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
+++ b/9/platforms/android-21/arch-x86/usr/include/android/api-level.h
@@ -28,6 +28,6 @@
 #ifndef ANDROID_API_LEVEL_H
 #define ANDROID_API_LEVEL_H
 
-#define __ANDROID_API__ 19
+#define __ANDROID_API__ 21
 
 #endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h b/9/platforms/android-21/arch-x86/usr/include/android/asset_manager.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/asset_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h b/9/platforms/android-21/arch-x86/usr/include/android/asset_manager_jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/asset_manager_jni.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/asset_manager_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h b/9/platforms/android-21/arch-x86/usr/include/android/bitmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/bitmap.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/configuration.h b/9/platforms/android-21/arch-x86/usr/include/android/configuration.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/configuration.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/configuration.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/dlext.h b/9/platforms/android-21/arch-x86/usr/include/android/dlext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/dlext.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/dlext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/input.h b/9/platforms/android-21/arch-x86/usr/include/android/input.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/input.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/input.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h b/9/platforms/android-21/arch-x86/usr/include/android/keycodes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/keycodes.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/keycodes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/log.h b/9/platforms/android-21/arch-x86/usr/include/android/log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/log.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/looper.h b/9/platforms/android-21/arch-x86/usr/include/android/looper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/looper.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/looper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h b/9/platforms/android-21/arch-x86/usr/include/android/native_activity.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_activity.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/native_activity.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window.h b/9/platforms/android-21/arch-x86/usr/include/android/native_window.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_window.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/native_window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h b/9/platforms/android-21/arch-x86/usr/include/android/native_window_jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/native_window_jni.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/native_window_jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/obb.h b/9/platforms/android-21/arch-x86/usr/include/android/obb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/obb.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/obb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/rect.h b/9/platforms/android-21/arch-x86/usr/include/android/rect.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/rect.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/rect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/sensor.h b/9/platforms/android-21/arch-x86/usr/include/android/sensor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/sensor.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/sensor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h b/9/platforms/android-21/arch-x86/usr/include/android/storage_manager.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/storage_manager.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/storage_manager.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/tts.h b/9/platforms/android-21/arch-x86/usr/include/android/tts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/tts.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/tts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/window.h b/9/platforms/android-21/arch-x86/usr/include/android/window.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/window.h
copy to 9/platforms/android-21/arch-x86/usr/include/android/window.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ar.h b/9/platforms/android-21/arch-x86/usr/include/ar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ar.h
copy to 9/platforms/android-21/arch-x86/usr/include/ar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h b/9/platforms/android-21/arch-x86/usr/include/arpa/inet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/inet.h
copy to 9/platforms/android-21/arch-x86/usr/include/arpa/inet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h b/9/platforms/android-21/arch-x86/usr/include/arpa/nameser.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser.h
copy to 9/platforms/android-21/arch-x86/usr/include/arpa/nameser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h b/9/platforms/android-21/arch-x86/usr/include/arpa/nameser_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/nameser_compat.h
copy to 9/platforms/android-21/arch-x86/usr/include/arpa/nameser_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h b/9/platforms/android-21/arch-x86/usr/include/arpa/telnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/arpa/telnet.h
copy to 9/platforms/android-21/arch-x86/usr/include/arpa/telnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/auxvec.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/bitsperlong.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/bitsperlong.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/bitsperlong.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/errno-base.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno-base.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/errno-base.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/errno.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/fcntl.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/int-l64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-l64.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/int-l64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/int-ll64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/int-ll64.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/int-ll64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ioctls.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/ipcbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ipcbuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/ipcbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/kvm_para.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/mman-common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman-common.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/mman-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/mman.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/msgbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/msgbuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/msgbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/param.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/poll.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/posix_types.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/resource.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/sembuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sembuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/sembuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/setup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/setup.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/setup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/shmbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmbuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/shmbuf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/shmparam.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/shmparam.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/shmparam.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/siginfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/siginfo.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/siginfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/signal-defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal-defs.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/signal-defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/signal.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/socket.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/sockios.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/stat.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/statfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/swab.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/termbits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termbits.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/termios.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/types.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/ucontext.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h b/9/platforms/android-21/arch-x86/usr/include/asm-generic/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm-generic/unistd.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm-generic/unistd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/a.out.h b/9/platforms/android-21/arch-x86/usr/include/asm/a.out.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/a.out.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/a.out.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/auxvec.h b/9/platforms/android-21/arch-x86/usr/include/asm/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/auxvec.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/auxvec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/bitsperlong.h b/9/platforms/android-21/arch-x86/usr/include/asm/bitsperlong.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/bitsperlong.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/bitsperlong.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/boot.h b/9/platforms/android-21/arch-x86/usr/include/asm/boot.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/boot.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/boot.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/bootparam.h b/9/platforms/android-21/arch-x86/usr/include/asm/bootparam.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/bootparam.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/bootparam.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/byteorder.h b/9/platforms/android-21/arch-x86/usr/include/asm/byteorder.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/byteorder.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/byteorder.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/debugreg.h b/9/platforms/android-21/arch-x86/usr/include/asm/debugreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/debugreg.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/debugreg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/e820.h b/9/platforms/android-21/arch-x86/usr/include/asm/e820.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/e820.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/e820.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/errno.h b/9/platforms/android-21/arch-x86/usr/include/asm/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/errno.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/errno.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/fcntl.h b/9/platforms/android-21/arch-x86/usr/include/asm/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/fcntl.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/fcntl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/hw_breakpoint.h b/9/platforms/android-21/arch-x86/usr/include/asm/hw_breakpoint.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/hw_breakpoint.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/hyperv.h b/9/platforms/android-21/arch-x86/usr/include/asm/hyperv.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/hyperv.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/hyperv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ioctl.h b/9/platforms/android-21/arch-x86/usr/include/asm/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ioctls.h b/9/platforms/android-21/arch-x86/usr/include/asm/ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/ioctls.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h b/9/platforms/android-21/arch-x86/usr/include/asm/ipcbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/ipcbuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ipcbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ist.h b/9/platforms/android-21/arch-x86/usr/include/asm/ist.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/ist.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ist.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/kvm.h b/9/platforms/android-21/arch-x86/usr/include/asm/kvm.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/kvm.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/kvm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/kvm_para.h b/9/platforms/android-21/arch-x86/usr/include/asm/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/kvm_para.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/kvm_para.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ldt.h b/9/platforms/android-21/arch-x86/usr/include/asm/ldt.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/ldt.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ldt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/mce.h b/9/platforms/android-21/arch-x86/usr/include/asm/mce.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/mce.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/mce.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/mman.h b/9/platforms/android-21/arch-x86/usr/include/asm/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/mman.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/msgbuf.h b/9/platforms/android-21/arch-x86/usr/include/asm/msgbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/msgbuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/msgbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/msr-index.h b/9/platforms/android-21/arch-x86/usr/include/asm/msr-index.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/msr-index.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/msr-index.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/msr.h b/9/platforms/android-21/arch-x86/usr/include/asm/msr.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/msr.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/msr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/mtrr.h b/9/platforms/android-21/arch-x86/usr/include/asm/mtrr.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/mtrr.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/mtrr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/param.h b/9/platforms/android-21/arch-x86/usr/include/asm/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/param.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/param.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/perf_regs.h b/9/platforms/android-21/arch-x86/usr/include/asm/perf_regs.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/perf_regs.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/perf_regs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/poll.h b/9/platforms/android-21/arch-x86/usr/include/asm/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/poll.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/poll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types.h b/9/platforms/android-21/arch-x86/usr/include/asm/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/posix_types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_32.h b/9/platforms/android-21/arch-x86/usr/include/asm/posix_types_32.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_32.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/posix_types_32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_64.h b/9/platforms/android-21/arch-x86/usr/include/asm/posix_types_64.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_64.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/posix_types_64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_x32.h b/9/platforms/android-21/arch-x86/usr/include/asm/posix_types_x32.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_x32.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/posix_types_x32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/prctl.h b/9/platforms/android-21/arch-x86/usr/include/asm/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/prctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/prctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/processor-flags.h b/9/platforms/android-21/arch-x86/usr/include/asm/processor-flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/processor-flags.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/processor-flags.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace-abi.h b/9/platforms/android-21/arch-x86/usr/include/asm/ptrace-abi.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace-abi.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ptrace-abi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace.h b/9/platforms/android-21/arch-x86/usr/include/asm/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/resource.h b/9/platforms/android-21/arch-x86/usr/include/asm/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/resource.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/resource.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sembuf.h b/9/platforms/android-21/arch-x86/usr/include/asm/sembuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/sembuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/sembuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/setup.h b/9/platforms/android-21/arch-x86/usr/include/asm/setup.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/setup.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/setup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/shmbuf.h b/9/platforms/android-21/arch-x86/usr/include/asm/shmbuf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/shmbuf.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/shmbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext.h b/9/platforms/android-21/arch-x86/usr/include/asm/sigcontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/sigcontext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext32.h b/9/platforms/android-21/arch-x86/usr/include/asm/sigcontext32.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext32.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/sigcontext32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/siginfo.h b/9/platforms/android-21/arch-x86/usr/include/asm/siginfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/siginfo.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/siginfo.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/signal.h b/9/platforms/android-21/arch-x86/usr/include/asm/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/signal.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/socket.h b/9/platforms/android-21/arch-x86/usr/include/asm/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/socket.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/sockios.h b/9/platforms/android-21/arch-x86/usr/include/asm/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/sockios.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/sockios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/stat.h b/9/platforms/android-21/arch-x86/usr/include/asm/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/stat.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/stat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/statfs.h b/9/platforms/android-21/arch-x86/usr/include/asm/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/statfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/statfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/svm.h b/9/platforms/android-21/arch-x86/usr/include/asm/svm.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/svm.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/svm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/swab.h b/9/platforms/android-21/arch-x86/usr/include/asm/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/swab.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/termbits.h b/9/platforms/android-21/arch-x86/usr/include/asm/termbits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/termbits.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/termbits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/asm/termios.h b/9/platforms/android-21/arch-x86/usr/include/asm/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/asm/termios.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/termios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/types.h b/9/platforms/android-21/arch-x86/usr/include/asm/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/types.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ucontext.h b/9/platforms/android-21/arch-x86/usr/include/asm/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/ucontext.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/ucontext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd.h b/9/platforms/android-21/arch-x86/usr/include/asm/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/unistd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_32.h b/9/platforms/android-21/arch-x86/usr/include/asm/unistd_32.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_32.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/unistd_32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_64.h b/9/platforms/android-21/arch-x86/usr/include/asm/unistd_64.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_64.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/unistd_64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_x32.h b/9/platforms/android-21/arch-x86/usr/include/asm/unistd_x32.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_x32.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/unistd_x32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/vm86.h b/9/platforms/android-21/arch-x86/usr/include/asm/vm86.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/vm86.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/vm86.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/vmx.h b/9/platforms/android-21/arch-x86/usr/include/asm/vmx.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/vmx.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/vmx.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/vsyscall.h b/9/platforms/android-21/arch-x86/usr/include/asm/vsyscall.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/asm/vsyscall.h
copy to 9/platforms/android-21/arch-x86/usr/include/asm/vsyscall.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/assert.h b/9/platforms/android-21/arch-x86/usr/include/assert.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/assert.h
copy to 9/platforms/android-21/arch-x86/usr/include/assert.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/byteswap.h b/9/platforms/android-21/arch-x86/usr/include/byteswap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/byteswap.h
copy to 9/platforms/android-21/arch-x86/usr/include/byteswap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/complex.h b/9/platforms/android-21/arch-x86/usr/include/complex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/complex.h
copy to 9/platforms/android-21/arch-x86/usr/include/complex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ctype.h b/9/platforms/android-21/arch-x86/usr/include/ctype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ctype.h
copy to 9/platforms/android-21/arch-x86/usr/include/ctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dirent.h b/9/platforms/android-21/arch-x86/usr/include/dirent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/dirent.h
copy to 9/platforms/android-21/arch-x86/usr/include/dirent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/dlfcn.h b/9/platforms/android-21/arch-x86/usr/include/dlfcn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/dlfcn.h
copy to 9/platforms/android-21/arch-x86/usr/include/dlfcn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/elf.h b/9/platforms/android-21/arch-x86/usr/include/elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/elf.h
copy to 9/platforms/android-21/arch-x86/usr/include/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/endian.h b/9/platforms/android-21/arch-x86/usr/include/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/endian.h
copy to 9/platforms/android-21/arch-x86/usr/include/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/err.h b/9/platforms/android-21/arch-x86/usr/include/err.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/err.h
copy to 9/platforms/android-21/arch-x86/usr/include/err.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/errno.h b/9/platforms/android-21/arch-x86/usr/include/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/errno.h
copy to 9/platforms/android-21/arch-x86/usr/include/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fcntl.h b/9/platforms/android-21/arch-x86/usr/include/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fcntl.h
copy to 9/platforms/android-21/arch-x86/usr/include/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/features.h b/9/platforms/android-21/arch-x86/usr/include/features.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/features.h
copy to 9/platforms/android-21/arch-x86/usr/include/features.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fenv.h b/9/platforms/android-21/arch-x86/usr/include/fenv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fenv.h
copy to 9/platforms/android-21/arch-x86/usr/include/fenv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fnmatch.h b/9/platforms/android-21/arch-x86/usr/include/fnmatch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fnmatch.h
copy to 9/platforms/android-21/arch-x86/usr/include/fnmatch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/fts.h b/9/platforms/android-21/arch-x86/usr/include/fts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/fts.h
copy to 9/platforms/android-21/arch-x86/usr/include/fts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ftw.h b/9/platforms/android-21/arch-x86/usr/include/ftw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ftw.h
copy to 9/platforms/android-21/arch-x86/usr/include/ftw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/getopt.h b/9/platforms/android-21/arch-x86/usr/include/getopt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/getopt.h
copy to 9/platforms/android-21/arch-x86/usr/include/getopt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/grp.h b/9/platforms/android-21/arch-x86/usr/include/grp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/grp.h
copy to 9/platforms/android-21/arch-x86/usr/include/grp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/i386/elf_machdep.h b/9/platforms/android-21/arch-x86/usr/include/i386/elf_machdep.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/i386/elf_machdep.h
copy to 9/platforms/android-21/arch-x86/usr/include/i386/elf_machdep.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/inttypes.h b/9/platforms/android-21/arch-x86/usr/include/inttypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/inttypes.h
copy to 9/platforms/android-21/arch-x86/usr/include/inttypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/jni.h b/9/platforms/android-21/arch-x86/usr/include/jni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/jni.h
copy to 9/platforms/android-21/arch-x86/usr/include/jni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/lastlog.h b/9/platforms/android-21/arch-x86/usr/include/lastlog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/lastlog.h
copy to 9/platforms/android-21/arch-x86/usr/include/lastlog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/libgen.h b/9/platforms/android-21/arch-x86/usr/include/libgen.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/libgen.h
copy to 9/platforms/android-21/arch-x86/usr/include/libgen.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/limits.h b/9/platforms/android-21/arch-x86/usr/include/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/limits.h
copy to 9/platforms/android-21/arch-x86/usr/include/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/link.h b/9/platforms/android-21/arch-x86/usr/include/link.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/link.h
copy to 9/platforms/android-21/arch-x86/usr/include/link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h b/9/platforms/android-21/arch-x86/usr/include/linux/a.out.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/a.out.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/a.out.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/acct.h b/9/platforms/android-21/arch-x86/usr/include/linux/acct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/acct.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adb.h b/9/platforms/android-21/arch-x86/usr/include/linux/adb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/adb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/adb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/adfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/adfs_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/adfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h b/9/platforms/android-21/arch-x86/usr/include/linux/affs_hardblocks.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/affs_hardblocks.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/affs_hardblocks.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h b/9/platforms/android-21/arch-x86/usr/include/linux/agpgart.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/agpgart.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/agpgart.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h b/9/platforms/android-21/arch-x86/usr/include/linux/aio_abi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/aio_abi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/aio_abi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h b/9/platforms/android-21/arch-x86/usr/include/linux/android_alarm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/android_alarm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/android_alarm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h b/9/platforms/android-21/arch-x86/usr/include/linux/apm_bios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/apm_bios.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/apm_bios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h b/9/platforms/android-21/arch-x86/usr/include/linux/arcfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/arcfb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/arcfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h b/9/platforms/android-21/arch-x86/usr/include/linux/ashmem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ashmem.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ashmem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h b/9/platforms/android-21/arch-x86/usr/include/linux/atalk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atalk.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm_eni.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_eni.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm_eni.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm_he.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_he.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm_he.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm_idt77105.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_idt77105.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm_idt77105.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm_nicstar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_nicstar.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm_nicstar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm_tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_tcp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h b/9/platforms/android-21/arch-x86/usr/include/linux/atm_zatm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atm_zatm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atm_zatm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmapi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmapi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmarp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmarp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmarp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmbr2684.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmbr2684.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmbr2684.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmclip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmclip.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmclip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmdev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmioc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmioc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmioc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmlec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmlec.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmlec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmmpc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmmpc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmmpc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmppp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmsap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsap.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmsap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h b/9/platforms/android-21/arch-x86/usr/include/linux/atmsvc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/atmsvc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/atmsvc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/audit.h b/9/platforms/android-21/arch-x86/usr/include/linux/audit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/audit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/audit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/auto_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/auto_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h b/9/platforms/android-21/arch-x86/usr/include/linux/auto_fs4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auto_fs4.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/auto_fs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h b/9/platforms/android-21/arch-x86/usr/include/linux/auxvec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/auxvec.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/auxvec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h b/9/platforms/android-21/arch-x86/usr/include/linux/ax25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ax25.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ax25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h b/9/platforms/android-21/arch-x86/usr/include/linux/b1lli.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/b1lli.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/b1lli.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h b/9/platforms/android-21/arch-x86/usr/include/linux/baycom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/baycom.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/baycom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h b/9/platforms/android-21/arch-x86/usr/include/linux/bcache.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bcache.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/bcache.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h b/9/platforms/android-21/arch-x86/usr/include/linux/bcm933xx_hcs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bcm933xx_hcs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/bcm933xx_hcs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/bfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bfs_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/bfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binder.h b/9/platforms/android-21/arch-x86/usr/include/linux/binder.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/binder.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/binder.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h b/9/platforms/android-21/arch-x86/usr/include/linux/binfmts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/binfmts.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/binfmts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h b/9/platforms/android-21/arch-x86/usr/include/linux/blkpg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/blkpg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/blkpg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h b/9/platforms/android-21/arch-x86/usr/include/linux/blktrace_api.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/blktrace_api.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/blktrace_api.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h b/9/platforms/android-21/arch-x86/usr/include/linux/bpqether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bpqether.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/bpqether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h b/9/platforms/android-21/arch-x86/usr/include/linux/bsg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/bsg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/bsg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h b/9/platforms/android-21/arch-x86/usr/include/linux/btrfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/btrfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/btrfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h b/9/platforms/android-21/arch-x86/usr/include/linux/byteorder/big_endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/big_endian.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/byteorder/big_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h b/9/platforms/android-21/arch-x86/usr/include/linux/byteorder/little_endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/byteorder/little_endian.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/byteorder/little_endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h b/9/platforms/android-21/arch-x86/usr/include/linux/caif/caif_socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/caif_socket.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/caif/caif_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h b/9/platforms/android-21/arch-x86/usr/include/linux/caif/if_caif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/caif/if_caif.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/caif/if_caif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can.h b/9/platforms/android-21/arch-x86/usr/include/linux/can.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/can.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h b/9/platforms/android-21/arch-x86/usr/include/linux/can/bcm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/bcm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/can/bcm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h b/9/platforms/android-21/arch-x86/usr/include/linux/can/error.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/error.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/can/error.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h b/9/platforms/android-21/arch-x86/usr/include/linux/can/gw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/gw.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/can/gw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/can/netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/netlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/can/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h b/9/platforms/android-21/arch-x86/usr/include/linux/can/raw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/can/raw.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/can/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capability.h b/9/platforms/android-21/arch-x86/usr/include/linux/capability.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/capability.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/capi.h b/9/platforms/android-21/arch-x86/usr/include/linux/capi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/capi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/capi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h b/9/platforms/android-21/arch-x86/usr/include/linux/cciss_defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_defs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cciss_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/cciss_ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cciss_ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cciss_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h b/9/platforms/android-21/arch-x86/usr/include/linux/cdrom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cdrom.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cdrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h b/9/platforms/android-21/arch-x86/usr/include/linux/cgroupstats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cgroupstats.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cgroupstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/chio.h b/9/platforms/android-21/arch-x86/usr/include/linux/chio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/chio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/chio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h b/9/platforms/android-21/arch-x86/usr/include/linux/cifs/cifs_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cifs/cifs_mount.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cifs/cifs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h b/9/platforms/android-21/arch-x86/usr/include/linux/cm4000_cs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cm4000_cs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cm4000_cs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h b/9/platforms/android-21/arch-x86/usr/include/linux/cn_proc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cn_proc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cn_proc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda.h b/9/platforms/android-21/arch-x86/usr/include/linux/coda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coda.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/coda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h b/9/platforms/android-21/arch-x86/usr/include/linux/coda_psdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coda_psdev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/coda_psdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/coff.h b/9/platforms/android-21/arch-x86/usr/include/linux/coff.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/coff.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/coff.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h b/9/platforms/android-21/arch-x86/usr/include/linux/compiler.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/compiler.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/compiler.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/connector.h b/9/platforms/android-21/arch-x86/usr/include/linux/connector.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/connector.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/connector.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/const.h b/9/platforms/android-21/arch-x86/usr/include/linux/const.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/const.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/const.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/cramfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cramfs_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cramfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h b/9/platforms/android-21/arch-x86/usr/include/linux/cuda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cuda.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cuda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h b/9/platforms/android-21/arch-x86/usr/include/linux/cyclades.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cyclades.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cyclades.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h b/9/platforms/android-21/arch-x86/usr/include/linux/cycx_cfm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/cycx_cfm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/cycx_cfm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h b/9/platforms/android-21/arch-x86/usr/include/linux/dcbnl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dcbnl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dcbnl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h b/9/platforms/android-21/arch-x86/usr/include/linux/dccp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dccp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h b/9/platforms/android-21/arch-x86/usr/include/linux/dlm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dlm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h b/9/platforms/android-21/arch-x86/usr/include/linux/dlm_device.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_device.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dlm_device.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/dlm_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_netlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dlm_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h b/9/platforms/android-21/arch-x86/usr/include/linux/dlm_plock.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlm_plock.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dlm_plock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h b/9/platforms/android-21/arch-x86/usr/include/linux/dlmconstants.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dlmconstants.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dlmconstants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/dm-ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dm-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h b/9/platforms/android-21/arch-x86/usr/include/linux/dm-log-userspace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dm-log-userspace.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dm-log-userspace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dn.h b/9/platforms/android-21/arch-x86/usr/include/linux/dn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dn.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h b/9/platforms/android-21/arch-x86/usr/include/linux/dqblk_xfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dqblk_xfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dqblk_xfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/audio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/audio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/ca.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/ca.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/ca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/dmx.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/dmx.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/dmx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/frontend.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/frontend.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/frontend.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/net.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/osd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/osd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/osd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/version.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/version.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h b/9/platforms/android-21/arch-x86/usr/include/linux/dvb/video.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/dvb/video.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/dvb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/edd.h b/9/platforms/android-21/arch-x86/usr/include/linux/edd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/edd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/edd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h b/9/platforms/android-21/arch-x86/usr/include/linux/efs_fs_sb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/efs_fs_sb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/efs_fs_sb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h b/9/platforms/android-21/arch-x86/usr/include/linux/elf-em.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-em.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/elf-em.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h b/9/platforms/android-21/arch-x86/usr/include/linux/elf-fdpic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf-fdpic.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/elf-fdpic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elf.h b/9/platforms/android-21/arch-x86/usr/include/linux/elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elf.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h b/9/platforms/android-21/arch-x86/usr/include/linux/elfcore.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/elfcore.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/elfcore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errno.h b/9/platforms/android-21/arch-x86/usr/include/linux/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/errno.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h b/9/platforms/android-21/arch-x86/usr/include/linux/errqueue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/errqueue.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/errqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h b/9/platforms/android-21/arch-x86/usr/include/linux/ethtool.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ethtool.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ethtool.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h b/9/platforms/android-21/arch-x86/usr/include/linux/eventpoll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/eventpoll.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/eventpoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h b/9/platforms/android-21/arch-x86/usr/include/linux/fadvise.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fadvise.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fadvise.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h b/9/platforms/android-21/arch-x86/usr/include/linux/falloc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/falloc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/falloc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h b/9/platforms/android-21/arch-x86/usr/include/linux/fanotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fanotify.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fanotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fb.h b/9/platforms/android-21/arch-x86/usr/include/linux/fb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h b/9/platforms/android-21/arch-x86/usr/include/linux/fcntl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fcntl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fcntl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fd.h b/9/platforms/android-21/arch-x86/usr/include/linux/fd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h b/9/platforms/android-21/arch-x86/usr/include/linux/fdreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fdreg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h b/9/platforms/android-21/arch-x86/usr/include/linux/fib_rules.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fib_rules.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fib_rules.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h b/9/platforms/android-21/arch-x86/usr/include/linux/fiemap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fiemap.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fiemap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/filter.h b/9/platforms/android-21/arch-x86/usr/include/linux/filter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/filter.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/filter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h b/9/platforms/android-21/arch-x86/usr/include/linux/firewire-cdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-cdev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/firewire-cdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h b/9/platforms/android-21/arch-x86/usr/include/linux/firewire-constants.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/firewire-constants.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/firewire-constants.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/flat.h b/9/platforms/android-21/arch-x86/usr/include/linux/flat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/flat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/flat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h b/9/platforms/android-21/arch-x86/usr/include/linux/fsl_hypervisor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fsl_hypervisor.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fsl_hypervisor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h b/9/platforms/android-21/arch-x86/usr/include/linux/fuse.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/fuse.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/fuse.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/futex.h b/9/platforms/android-21/arch-x86/usr/include/linux/futex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/futex.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/futex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h b/9/platforms/android-21/arch-x86/usr/include/linux/gameport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gameport.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/gameport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h b/9/platforms/android-21/arch-x86/usr/include/linux/gen_stats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gen_stats.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/gen_stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/genetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/genetlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/genetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h b/9/platforms/android-21/arch-x86/usr/include/linux/genwqe/genwqe_card.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/genwqe/genwqe_card.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/genwqe/genwqe_card.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h b/9/platforms/android-21/arch-x86/usr/include/linux/gfs2_ondisk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gfs2_ondisk.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/gfs2_ondisk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h b/9/platforms/android-21/arch-x86/usr/include/linux/gigaset_dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/gigaset_dev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/gigaset_dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h b/9/platforms/android-21/arch-x86/usr/include/linux/hash_info.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hash_info.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hash_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h b/9/platforms/android-21/arch-x86/usr/include/linux/hdlc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hdlc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/hdlc/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlc/ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hdlc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h b/9/platforms/android-21/arch-x86/usr/include/linux/hdlcdrv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdlcdrv.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hdlcdrv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h b/9/platforms/android-21/arch-x86/usr/include/linux/hdreg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hdreg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hdreg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hid.h b/9/platforms/android-21/arch-x86/usr/include/linux/hid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hid.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h b/9/platforms/android-21/arch-x86/usr/include/linux/hiddev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hiddev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hiddev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h b/9/platforms/android-21/arch-x86/usr/include/linux/hidraw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hidraw.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hidraw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h b/9/platforms/android-21/arch-x86/usr/include/linux/hpet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hpet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hpet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h b/9/platforms/android-21/arch-x86/usr/include/linux/hsi/hsi_char.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hsi/hsi_char.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hsi/hsi_char.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/hsr_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hsr_netlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hsr_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h b/9/platforms/android-21/arch-x86/usr/include/linux/hw_breakpoint.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hw_breakpoint.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h b/9/platforms/android-21/arch-x86/usr/include/linux/hysdn_if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/hysdn_if.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/hysdn_if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h b/9/platforms/android-21/arch-x86/usr/include/linux/i2c-dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c-dev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/i2c-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h b/9/platforms/android-21/arch-x86/usr/include/linux/i2c.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2c.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/i2c.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h b/9/platforms/android-21/arch-x86/usr/include/linux/i2o-dev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i2o-dev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/i2o-dev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h b/9/platforms/android-21/arch-x86/usr/include/linux/i8k.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/i8k.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/i8k.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h b/9/platforms/android-21/arch-x86/usr/include/linux/icmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/icmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h b/9/platforms/android-21/arch-x86/usr/include/linux/icmpv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/icmpv6.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/icmpv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if.h b/9/platforms/android-21/arch-x86/usr/include/linux/if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_addr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addr.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_addr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_addrlabel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_addrlabel.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_addrlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_alg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_alg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_alg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_arcnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arcnet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_arcnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_arp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_bonding.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bonding.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_bonding.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_bridge.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_bridge.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_cablemodem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_cablemodem.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_cablemodem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_eql.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_eql.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_eql.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ether.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_fc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_fc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_fddi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_fddi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_fddi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_frad.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_frad.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_frad.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_hippi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_hippi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_hippi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_infiniband.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_infiniband.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_infiniband.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_link.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_link.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_link.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_ltalk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ltalk.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_ltalk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_packet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_phonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_phonet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_plip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_plip.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_plip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_ppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_ppp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_pppol2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppol2tp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_pppol2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_pppolac.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppolac.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_pppolac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_pppopns.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppopns.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_pppopns.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_pppox.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_pppox.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_pppox.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_slip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_slip.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_slip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_team.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_team.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_team.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_tun.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tun.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_tun.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_tunnel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_tunnel.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_vlan.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_vlan.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h b/9/platforms/android-21/arch-x86/usr/include/linux/if_x25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/if_x25.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/if_x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h b/9/platforms/android-21/arch-x86/usr/include/linux/igmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/igmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/igmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in.h b/9/platforms/android-21/arch-x86/usr/include/linux/in.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in6.h b/9/platforms/android-21/arch-x86/usr/include/linux/in6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in6.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h b/9/platforms/android-21/arch-x86/usr/include/linux/in_route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/in_route.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/in_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h b/9/platforms/android-21/arch-x86/usr/include/linux/inet_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/inet_diag.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/inet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h b/9/platforms/android-21/arch-x86/usr/include/linux/inotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/inotify.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h b/9/platforms/android-21/arch-x86/usr/include/linux/input.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/input.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/input.h
index df3200c..b9d5b2a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h
+++ b/9/platforms/android-21/arch-x86/usr/include/linux/input.h
@@ -97,629 +97,644 @@
 #define INPUT_PROP_BUTTONPAD 0x02
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define INPUT_PROP_SEMI_MT 0x03
+#define INPUT_PROP_TOPBUTTONPAD 0x04
 #define INPUT_PROP_MAX 0x1f
 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_SYN 0x00
 #define EV_KEY 0x01
 #define EV_REL 0x02
 #define EV_ABS 0x03
-#define EV_MSC 0x04
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MSC 0x04
 #define EV_SW 0x05
 #define EV_LED 0x11
 #define EV_SND 0x12
-#define EV_REP 0x14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_REP 0x14
 #define EV_FF 0x15
 #define EV_PWR 0x16
 #define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MAX 0x1f
 #define EV_CNT (EV_MAX+1)
 #define SYN_REPORT 0
 #define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SYN_MT_REPORT 2
 #define SYN_DROPPED 3
 #define SYN_MAX 0xf
 #define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RESERVED 0
 #define KEY_ESC 1
 #define KEY_1 2
 #define KEY_2 3
-#define KEY_3 4
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_3 4
 #define KEY_4 5
 #define KEY_5 6
 #define KEY_6 7
-#define KEY_7 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_7 8
 #define KEY_8 9
 #define KEY_9 10
 #define KEY_0 11
-#define KEY_MINUS 12
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MINUS 12
 #define KEY_EQUAL 13
 #define KEY_BACKSPACE 14
 #define KEY_TAB 15
-#define KEY_Q 16
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Q 16
 #define KEY_W 17
 #define KEY_E 18
 #define KEY_R 19
-#define KEY_T 20
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_T 20
 #define KEY_Y 21
 #define KEY_U 22
 #define KEY_I 23
-#define KEY_O 24
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_O 24
 #define KEY_P 25
 #define KEY_LEFTBRACE 26
 #define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ENTER 28
 #define KEY_LEFTCTRL 29
 #define KEY_A 30
 #define KEY_S 31
-#define KEY_D 32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_D 32
 #define KEY_F 33
 #define KEY_G 34
 #define KEY_H 35
-#define KEY_J 36
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_J 36
 #define KEY_K 37
 #define KEY_L 38
 #define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_APOSTROPHE 40
 #define KEY_GRAVE 41
 #define KEY_LEFTSHIFT 42
 #define KEY_BACKSLASH 43
-#define KEY_Z 44
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Z 44
 #define KEY_X 45
 #define KEY_C 46
 #define KEY_V 47
-#define KEY_B 48
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_B 48
 #define KEY_N 49
 #define KEY_M 50
 #define KEY_COMMA 51
-#define KEY_DOT 52
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DOT 52
 #define KEY_SLASH 53
 #define KEY_RIGHTSHIFT 54
 #define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFTALT 56
 #define KEY_SPACE 57
 #define KEY_CAPSLOCK 58
 #define KEY_F1 59
-#define KEY_F2 60
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F2 60
 #define KEY_F3 61
 #define KEY_F4 62
 #define KEY_F5 63
-#define KEY_F6 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F6 64
 #define KEY_F7 65
 #define KEY_F8 66
 #define KEY_F9 67
-#define KEY_F10 68
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F10 68
 #define KEY_NUMLOCK 69
 #define KEY_SCROLLLOCK 70
 #define KEY_KP7 71
-#define KEY_KP8 72
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP8 72
 #define KEY_KP9 73
 #define KEY_KPMINUS 74
 #define KEY_KP4 75
-#define KEY_KP5 76
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP5 76
 #define KEY_KP6 77
 #define KEY_KPPLUS 78
 #define KEY_KP1 79
-#define KEY_KP2 80
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP2 80
 #define KEY_KP3 81
 #define KEY_KP0 82
 #define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ZENKAKUHANKAKU 85
 #define KEY_102ND 86
 #define KEY_F11 87
 #define KEY_F12 88
-#define KEY_RO 89
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RO 89
 #define KEY_KATAKANA 90
 #define KEY_HIRAGANA 91
 #define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KATAKANAHIRAGANA 93
 #define KEY_MUHENKAN 94
 #define KEY_KPJPCOMMA 95
 #define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RIGHTCTRL 97
 #define KEY_KPSLASH 98
 #define KEY_SYSRQ 99
 #define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LINEFEED 101
 #define KEY_HOME 102
 #define KEY_UP 103
 #define KEY_PAGEUP 104
-#define KEY_LEFT 105
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFT 105
 #define KEY_RIGHT 106
 #define KEY_END 107
 #define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PAGEDOWN 109
 #define KEY_INSERT 110
 #define KEY_DELETE 111
 #define KEY_MACRO 112
-#define KEY_MUTE 113
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MUTE 113
 #define KEY_VOLUMEDOWN 114
 #define KEY_VOLUMEUP 115
 #define KEY_POWER 116
-#define KEY_KPEQUAL 117
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPEQUAL 117
 #define KEY_KPPLUSMINUS 118
 #define KEY_PAUSE 119
 #define KEY_SCALE 120
-#define KEY_KPCOMMA 121
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPCOMMA 121
 #define KEY_HANGEUL 122
 #define KEY_HANGUEL KEY_HANGEUL
 #define KEY_HANJA 123
-#define KEY_YEN 124
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_YEN 124
 #define KEY_LEFTMETA 125
 #define KEY_RIGHTMETA 126
 #define KEY_COMPOSE 127
-#define KEY_STOP 128
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_STOP 128
 #define KEY_AGAIN 129
 #define KEY_PROPS 130
 #define KEY_UNDO 131
-#define KEY_FRONT 132
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FRONT 132
 #define KEY_COPY 133
 #define KEY_OPEN 134
 #define KEY_PASTE 135
-#define KEY_FIND 136
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FIND 136
 #define KEY_CUT 137
 #define KEY_HELP 138
 #define KEY_MENU 139
-#define KEY_CALC 140
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CALC 140
 #define KEY_SETUP 141
 #define KEY_SLEEP 142
 #define KEY_WAKEUP 143
-#define KEY_FILE 144
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FILE 144
 #define KEY_SENDFILE 145
 #define KEY_DELETEFILE 146
 #define KEY_XFER 147
-#define KEY_PROG1 148
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PROG1 148
 #define KEY_PROG2 149
 #define KEY_WWW 150
 #define KEY_MSDOS 151
-#define KEY_COFFEE 152
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_COFFEE 152
 #define KEY_SCREENLOCK KEY_COFFEE
 #define KEY_DIRECTION 153
 #define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MAIL 155
 #define KEY_BOOKMARKS 156
 #define KEY_COMPUTER 157
 #define KEY_BACK 158
-#define KEY_FORWARD 159
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FORWARD 159
 #define KEY_CLOSECD 160
 #define KEY_EJECTCD 161
 #define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_NEXTSONG 163
 #define KEY_PLAYPAUSE 164
 #define KEY_PREVIOUSSONG 165
 #define KEY_STOPCD 166
-#define KEY_RECORD 167
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RECORD 167
 #define KEY_REWIND 168
 #define KEY_PHONE 169
 #define KEY_ISO 170
-#define KEY_CONFIG 171
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CONFIG 171
 #define KEY_HOMEPAGE 172
 #define KEY_REFRESH 173
 #define KEY_EXIT 174
-#define KEY_MOVE 175
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MOVE 175
 #define KEY_EDIT 176
 #define KEY_SCROLLUP 177
 #define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPLEFTPAREN 179
 #define KEY_KPRIGHTPAREN 180
 #define KEY_NEW 181
 #define KEY_REDO 182
-#define KEY_F13 183
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F13 183
 #define KEY_F14 184
 #define KEY_F15 185
 #define KEY_F16 186
-#define KEY_F17 187
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F17 187
 #define KEY_F18 188
 #define KEY_F19 189
 #define KEY_F20 190
-#define KEY_F21 191
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F21 191
 #define KEY_F22 192
 #define KEY_F23 193
 #define KEY_F24 194
-#define KEY_PLAYCD 200
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PLAYCD 200
 #define KEY_PAUSECD 201
 #define KEY_PROG3 202
 #define KEY_PROG4 203
-#define KEY_DASHBOARD 204
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DASHBOARD 204
 #define KEY_SUSPEND 205
 #define KEY_CLOSE 206
 #define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FASTFORWARD 208
 #define KEY_BASSBOOST 209
 #define KEY_PRINT 210
 #define KEY_HP 211
-#define KEY_CAMERA 212
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CAMERA 212
 #define KEY_SOUND 213
 #define KEY_QUESTION 214
 #define KEY_EMAIL 215
-#define KEY_CHAT 216
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CHAT 216
 #define KEY_SEARCH 217
 #define KEY_CONNECT 218
 #define KEY_FINANCE 219
-#define KEY_SPORT 220
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SPORT 220
 #define KEY_SHOP 221
 #define KEY_ALTERASE 222
 #define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESSDOWN 224
 #define KEY_BRIGHTNESSUP 225
 #define KEY_MEDIA 226
 #define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KBDILLUMTOGGLE 228
 #define KEY_KBDILLUMDOWN 229
 #define KEY_KBDILLUMUP 230
 #define KEY_SEND 231
-#define KEY_REPLY 232
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_REPLY 232
 #define KEY_FORWARDMAIL 233
 #define KEY_SAVE 234
 #define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BATTERY 236
 #define KEY_BLUETOOTH 237
 #define KEY_WLAN 238
 #define KEY_UWB 239
-#define KEY_UNKNOWN 240
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_UNKNOWN 240
 #define KEY_VIDEO_NEXT 241
 #define KEY_VIDEO_PREV 242
 #define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_AUTO 244
+#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF 245
 #define KEY_WWAN 246
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WIMAX KEY_WWAN
 #define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MICMUTE 248
 #define BTN_MISC 0x100
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_0 0x100
 #define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_2 0x102
 #define BTN_3 0x103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_4 0x104
 #define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_6 0x106
 #define BTN_7 0x107
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_8 0x108
 #define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MOUSE 0x110
 #define BTN_LEFT 0x110
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_RIGHT 0x111
 #define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SIDE 0x113
 #define BTN_EXTRA 0x114
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_FORWARD 0x115
 #define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TASK 0x117
 #define BTN_JOYSTICK 0x120
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER 0x120
 #define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMB2 0x122
 #define BTN_TOP 0x123
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOP2 0x124
 #define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE 0x126
 #define BTN_BASE2 0x127
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE3 0x128
 #define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE5 0x12a
 #define BTN_BASE6 0x12b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DEAD 0x12f
 #define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SOUTH 0x130
 #define BTN_A BTN_SOUTH
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_EAST 0x131
 #define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_C 0x132
 #define BTN_NORTH 0x133
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_X BTN_NORTH
 #define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_Y BTN_WEST
 #define BTN_Z 0x135
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL 0x136
 #define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL2 0x138
 #define BTN_TR2 0x139
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SELECT 0x13a
 #define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MODE 0x13c
 #define BTN_THUMBL 0x13d
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMBR 0x13e
 #define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_PEN 0x140
 #define BTN_TOOL_RUBBER 0x141
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_BRUSH 0x142
 #define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_AIRBRUSH 0x144
 #define BTN_TOOL_FINGER 0x145
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_MOUSE 0x146
 #define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUINTTAP 0x148
 #define BTN_TOUCH 0x14a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_STYLUS 0x14b
 #define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_DOUBLETAP 0x14d
 #define BTN_TOOL_TRIPLETAP 0x14e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUADTAP 0x14f
 #define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_GEAR_DOWN 0x150
 #define BTN_GEAR_UP 0x151
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_OK 0x160
 #define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GOTO 0x162
 #define KEY_CLEAR 0x163
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_POWER2 0x164
 #define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_INFO 0x166
 #define KEY_TIME 0x167
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VENDOR 0x168
 #define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PROGRAM 0x16a
 #define KEY_CHANNEL 0x16b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FAVORITES 0x16c
 #define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PVR 0x16e
 #define KEY_MHP 0x16f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_LANGUAGE 0x170
 #define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SUBTITLE 0x172
 #define KEY_ANGLE 0x173
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOM 0x174
 #define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_KEYBOARD 0x176
 #define KEY_SCREEN 0x177
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PC 0x178
 #define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TV2 0x17a
 #define KEY_VCR 0x17b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VCR2 0x17c
 #define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SAT2 0x17e
 #define KEY_CD 0x17f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TAPE 0x180
 #define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TUNER 0x182
 #define KEY_PLAYER 0x183
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEXT 0x184
 #define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUX 0x186
 #define KEY_MP3 0x187
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUDIO 0x188
 #define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DIRECTORY 0x18a
 #define KEY_LIST 0x18b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEMO 0x18c
 #define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RED 0x18e
 #define KEY_GREEN 0x18f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_YELLOW 0x190
 #define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CHANNELUP 0x192
 #define KEY_CHANNELDOWN 0x193
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FIRST 0x194
 #define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AB 0x196
 #define KEY_NEXT 0x197
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RESTART 0x198
 #define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SHUFFLE 0x19a
 #define KEY_BREAK 0x19b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PREVIOUS 0x19c
 #define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEEN 0x19e
 #define KEY_TWEN 0x19f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VIDEOPHONE 0x1a0
 #define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMIN 0x1a2
 #define KEY_ZOOMOUT 0x1a3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMRESET 0x1a4
 #define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EDITOR 0x1a6
 #define KEY_SPREADSHEET 0x1a7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GRAPHICSEDITOR 0x1a8
 #define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DATABASE 0x1aa
 #define KEY_NEWS 0x1ab
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VOICEMAIL 0x1ac
 #define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MESSENGER 0x1ae
 #define KEY_DISPLAYTOGGLE 0x1af
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK 0x1b0
 #define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DOLLAR 0x1b2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EURO 0x1b3
 #define KEY_FRAMEBACK 0x1b4
 #define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CONTEXT_MENU 0x1b6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEDIA_REPEAT 0x1b7
 #define KEY_10CHANNELSUP 0x1b8
 #define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_IMAGES 0x1ba
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_EOL 0x1c0
 #define KEY_DEL_EOS 0x1c1
 #define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_LINE 0x1c3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN 0x1d0
 #define KEY_FN_ESC 0x1d1
 #define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F2 0x1d3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F3 0x1d4
 #define KEY_FN_F4 0x1d5
 #define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F6 0x1d7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F7 0x1d8
 #define KEY_FN_F8 0x1d9
 #define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F10 0x1db
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F11 0x1dc
 #define KEY_FN_F12 0x1dd
 #define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_2 0x1df
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_D 0x1e0
 #define KEY_FN_E 0x1e1
 #define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_S 0x1e3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_B 0x1e4
 #define KEY_BRL_DOT1 0x1f1
 #define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT3 0x1f3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT4 0x1f4
 #define KEY_BRL_DOT5 0x1f5
 #define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT7 0x1f7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT8 0x1f8
 #define KEY_BRL_DOT9 0x1f9
 #define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_0 0x200
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_1 0x201
 #define KEY_NUMERIC_2 0x202
 #define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_4 0x204
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_5 0x205
 #define KEY_NUMERIC_6 0x206
 #define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_8 0x208
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_9 0x209
 #define KEY_NUMERIC_STAR 0x20a
 #define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_FOCUS 0x210
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WPS_BUTTON 0x211
 #define KEY_TOUCHPAD_TOGGLE 0x212
 #define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TOUCHPAD_OFF 0x214
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_ZOOMIN 0x215
 #define KEY_CAMERA_ZOOMOUT 0x216
 #define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_DOWN 0x218
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_LEFT 0x219
 #define KEY_CAMERA_RIGHT 0x21a
 #define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_OFF 0x21c
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_TOGGLE 0x21d
 #define KEY_LIGHTS_TOGGLE 0x21e
 #define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_DOWN 0x221
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_LEFT 0x222
 #define BTN_DPAD_RIGHT 0x223
 #define KEY_ALS_TOGGLE 0x230
+#define KEY_BUTTONCONFIG 0x240
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_TASKMANAGER 0x241
+#define KEY_JOURNAL 0x242
+#define KEY_CONTROLPANEL 0x243
+#define KEY_APPSELECT 0x244
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SCREENSAVER 0x245
+#define KEY_VOICECOMMAND 0x246
+#define KEY_BRIGHTNESS_MIN 0x250
+#define KEY_BRIGHTNESS_MAX 0x251
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER_HAPPY 0x2c0
 #define BTN_TRIGGER_HAPPY1 0x2c0
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ion.h b/9/platforms/android-21/arch-x86/usr/include/linux/ion.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ion.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ion.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h b/9/platforms/android-21/arch-x86/usr/include/linux/ioprio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ioprio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ioprio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip.h b/9/platforms/android-21/arch-x86/usr/include/linux/ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h b/9/platforms/android-21/arch-x86/usr/include/linux/ip6_tunnel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip6_tunnel.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ip6_tunnel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h b/9/platforms/android-21/arch-x86/usr/include/linux/ip_vs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ip_vs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ip_vs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipmi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipmi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipmi_msgdefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipmi_msgdefs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipmi_msgdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipsec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipsec.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipsec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipv6_route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipv6_route.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipv6_route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h b/9/platforms/android-21/arch-x86/usr/include/linux/ipx.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ipx.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ipx.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irda.h b/9/platforms/android-21/arch-x86/usr/include/linux/irda.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/irda.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/irda.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h b/9/platforms/android-21/arch-x86/usr/include/linux/irqnr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/irqnr.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/irqnr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h b/9/platforms/android-21/arch-x86/usr/include/linux/isdn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/isdn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h b/9/platforms/android-21/arch-x86/usr/include/linux/isdn/capicmd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn/capicmd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/isdn/capicmd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h b/9/platforms/android-21/arch-x86/usr/include/linux/isdn_divertif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_divertif.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/isdn_divertif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h b/9/platforms/android-21/arch-x86/usr/include/linux/isdn_ppp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdn_ppp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/isdn_ppp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h b/9/platforms/android-21/arch-x86/usr/include/linux/isdnif.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/isdnif.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/isdnif.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/iso_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/iso_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/iso_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h b/9/platforms/android-21/arch-x86/usr/include/linux/ivtv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtv.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ivtv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h b/9/platforms/android-21/arch-x86/usr/include/linux/ivtvfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ivtvfb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ivtvfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h b/9/platforms/android-21/arch-x86/usr/include/linux/ixjuser.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ixjuser.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ixjuser.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h b/9/platforms/android-21/arch-x86/usr/include/linux/jffs2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/jffs2.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/jffs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h b/9/platforms/android-21/arch-x86/usr/include/linux/joystick.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/joystick.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/joystick.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kd.h b/9/platforms/android-21/arch-x86/usr/include/linux/kd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h b/9/platforms/android-21/arch-x86/usr/include/linux/kdev_t.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kdev_t.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kdev_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h b/9/platforms/android-21/arch-x86/usr/include/linux/kernel-page-flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel-page-flags.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kernel-page-flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h b/9/platforms/android-21/arch-x86/usr/include/linux/kernel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernel.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kernel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h b/9/platforms/android-21/arch-x86/usr/include/linux/kernelcapi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kernelcapi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kernelcapi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h b/9/platforms/android-21/arch-x86/usr/include/linux/kexec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kexec.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kexec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h b/9/platforms/android-21/arch-x86/usr/include/linux/keyboard.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keyboard.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/keyboard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h b/9/platforms/android-21/arch-x86/usr/include/linux/keychord.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keychord.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/keychord.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/keyctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/keyctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/keyctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h b/9/platforms/android-21/arch-x86/usr/include/linux/kvm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kvm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h b/9/platforms/android-21/arch-x86/usr/include/linux/kvm_para.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/kvm_para.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/kvm_para.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h b/9/platforms/android-21/arch-x86/usr/include/linux/l2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/l2tp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h b/9/platforms/android-21/arch-x86/usr/include/linux/libc-compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/libc-compat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/libc-compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/limits.h b/9/platforms/android-21/arch-x86/usr/include/linux/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/limits.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/llc.h b/9/platforms/android-21/arch-x86/usr/include/linux/llc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/llc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/llc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/loop.h b/9/platforms/android-21/arch-x86/usr/include/linux/loop.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/loop.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/loop.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/lp.h b/9/platforms/android-21/arch-x86/usr/include/linux/lp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/lp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/lp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/magic.h b/9/platforms/android-21/arch-x86/usr/include/linux/magic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/magic.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/magic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/major.h b/9/platforms/android-21/arch-x86/usr/include/linux/major.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/major.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/major.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h b/9/platforms/android-21/arch-x86/usr/include/linux/map_to_7segment.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/map_to_7segment.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/map_to_7segment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h b/9/platforms/android-21/arch-x86/usr/include/linux/matroxfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/matroxfb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/matroxfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h b/9/platforms/android-21/arch-x86/usr/include/linux/mdio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mdio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/media.h b/9/platforms/android-21/arch-x86/usr/include/linux/media.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/media.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/media.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mei.h b/9/platforms/android-21/arch-x86/usr/include/linux/mei.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mei.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mei.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h b/9/platforms/android-21/arch-x86/usr/include/linux/mempolicy.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mempolicy.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mempolicy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/meye.h b/9/platforms/android-21/arch-x86/usr/include/linux/meye.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/meye.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/meye.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h b/9/platforms/android-21/arch-x86/usr/include/linux/mic_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_common.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mic_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/mic_ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mic_ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mic_ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mii.h b/9/platforms/android-21/arch-x86/usr/include/linux/mii.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mii.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mii.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/minix_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/minix_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/minix_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mman.h b/9/platforms/android-21/arch-x86/usr/include/linux/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mman.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/mmc/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mmc/ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mmc/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h b/9/platforms/android-21/arch-x86/usr/include/linux/mmtimer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mmtimer.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mmtimer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/module.h b/9/platforms/android-21/arch-x86/usr/include/linux/module.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/module.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/module.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h b/9/platforms/android-21/arch-x86/usr/include/linux/mqueue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mqueue.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mqueue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h b/9/platforms/android-21/arch-x86/usr/include/linux/mroute.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mroute.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h b/9/platforms/android-21/arch-x86/usr/include/linux/mroute6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mroute6.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mroute6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/msdos_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/msdos_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/msdos_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/msg.h b/9/platforms/android-21/arch-x86/usr/include/linux/msg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/msg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h b/9/platforms/android-21/arch-x86/usr/include/linux/mtio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/mtio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/mtio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h b/9/platforms/android-21/arch-x86/usr/include/linux/n_r3964.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/n_r3964.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/n_r3964.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h b/9/platforms/android-21/arch-x86/usr/include/linux/nbd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nbd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nbd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h b/9/platforms/android-21/arch-x86/usr/include/linux/ncp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ncp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/ncp_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ncp_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h b/9/platforms/android-21/arch-x86/usr/include/linux/ncp_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_mount.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ncp_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h b/9/platforms/android-21/arch-x86/usr/include/linux/ncp_no.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ncp_no.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ncp_no.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h b/9/platforms/android-21/arch-x86/usr/include/linux/neighbour.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/neighbour.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/neighbour.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net.h b/9/platforms/android-21/arch-x86/usr/include/linux/net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h b/9/platforms/android-21/arch-x86/usr/include/linux/net_dropmon.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net_dropmon.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/net_dropmon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h b/9/platforms/android-21/arch-x86/usr/include/linux/net_tstamp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/net_tstamp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/net_tstamp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h b/9/platforms/android-21/arch-x86/usr/include/linux/netconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netconf.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h b/9/platforms/android-21/arch-x86/usr/include/linux/netdevice.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netdevice.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netdevice.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_hash.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/ipset/ip_set_list.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_common.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_ftp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_sctp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tcp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_nat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nf_tables_compat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nf_tables_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_acct.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_acct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_compat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_conntrack.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cthelper.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_log.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/nfnetlink_queue.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/nfnetlink_queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/x_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/x_tables.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/x_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_AUDIT.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_AUDIT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CHECKSUM.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CLASSIFY.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNMARK.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CONNMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CONNSECMARK.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_CT.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_CT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_DSCP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_DSCP.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_DSCP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_HMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_HMARK.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_HMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_IDLETIMER.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_LED.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LED.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_LED.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_LOG.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_MARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_MARK.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_MARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFLOG.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_NFLOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_NFQUEUE.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_RATEEST.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_RATEEST.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SECMARK.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_SECMARK.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_SYNPROXY.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPMSS.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TCPMSS.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TEE.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TEE.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TEE.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_TPROXY.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_TPROXY.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_addrtype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_addrtype.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_addrtype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_bpf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_bpf.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_bpf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_cgroup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cgroup.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_cgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_cluster.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cluster.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_cluster.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_comment.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_comment.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_comment.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connbytes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connbytes.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connbytes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connlabel.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlabel.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connlabel.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connlimit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connlimit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connmark.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_connmark.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_connmark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_conntrack.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_conntrack.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_conntrack.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_cpu.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_cpu.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_cpu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_dccp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dccp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_dccp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_devgroup.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_devgroup.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_devgroup.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_dscp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_dscp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_dscp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_ecn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ecn.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_esp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_esp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_esp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_hashlimit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_hashlimit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_helper.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_helper.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_helper.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipcomp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_ipcomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_iprange.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_iprange.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_iprange.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_ipvs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_ipvs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_ipvs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_l2tp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_l2tp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_l2tp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_length.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_length.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_length.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_limit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_limit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_mac.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mac.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_mac.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_mark.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_mark.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_mark.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_multiport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_multiport.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_multiport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_nfacct.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_nfacct.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_nfacct.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_osf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_osf.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_osf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_owner.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_owner.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_owner.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_physdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_physdev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_physdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_pkttype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_pkttype.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_policy.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_policy.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_policy.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_quota.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_quota.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_rateest.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rateest.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_rateest.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_realm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_realm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_realm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_recent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_recent.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_recent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_rpfilter.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_rpfilter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_sctp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_set.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_set.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_set.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_socket.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_state.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_state.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_state.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_statistic.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_statistic.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_statistic.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_string.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpmss.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_tcpmss.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_tcpudp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_tcpudp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_time.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_u32.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter/xt_u32.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter/xt_u32.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arp_tables.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_arp/arp_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_arp/arpt_mangle.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_802_3.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_among.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_among.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ip6.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_limit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_log.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_log.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_nflog.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_redirect.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_stp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_ulog.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebt_vlan.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_bridge/ebtables.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_bridge/ebtables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_decnet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_decnet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_decnet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ip_tables.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ah.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6_tables.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h b/9/platforms/android-21/arch-x86/usr/include/linux/netlink_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netlink_diag.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netlink_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h b/9/platforms/android-21/arch-x86/usr/include/linux/netrom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/netrom.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/netrom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs2.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs3.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs3.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs3.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs4.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs4.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs4_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs4_mount.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs4_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs_idmap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_idmap.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs_idmap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfs_mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfs_mount.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfs_mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfsacl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsacl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfsacl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfsd/cld.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/cld.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfsd/cld.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfsd/debug.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/debug.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfsd/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfsd/export.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/export.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfsd/export.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfsd/nfsfh.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/nfsfh.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfsd/nfsfh.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h b/9/platforms/android-21/arch-x86/usr/include/linux/nfsd/stats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nfsd/stats.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nfsd/stats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h b/9/platforms/android-21/arch-x86/usr/include/linux/nl80211.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nl80211.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nl80211.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h b/9/platforms/android-21/arch-x86/usr/include/linux/nubus.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nubus.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nubus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h b/9/platforms/android-21/arch-x86/usr/include/linux/nvme.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nvme.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nvme.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h b/9/platforms/android-21/arch-x86/usr/include/linux/nvram.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/nvram.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/nvram.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h b/9/platforms/android-21/arch-x86/usr/include/linux/omap3isp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/omap3isp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/omap3isp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h b/9/platforms/android-21/arch-x86/usr/include/linux/omapfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/omapfb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/omapfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/oom.h b/9/platforms/android-21/arch-x86/usr/include/linux/oom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/oom.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/oom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h b/9/platforms/android-21/arch-x86/usr/include/linux/openvswitch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/openvswitch.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/openvswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h b/9/platforms/android-21/arch-x86/usr/include/linux/packet_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/packet_diag.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/packet_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/param.h b/9/platforms/android-21/arch-x86/usr/include/linux/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/param.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/parport.h b/9/platforms/android-21/arch-x86/usr/include/linux/parport.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/parport.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/parport.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h b/9/platforms/android-21/arch-x86/usr/include/linux/patchkey.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/patchkey.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/patchkey.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci.h b/9/platforms/android-21/arch-x86/usr/include/linux/pci.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pci.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h b/9/platforms/android-21/arch-x86/usr/include/linux/pci_regs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pci_regs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pci_regs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h b/9/platforms/android-21/arch-x86/usr/include/linux/perf_event.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/perf_event.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/perf_event.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/personality.h b/9/platforms/android-21/arch-x86/usr/include/linux/personality.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/personality.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h b/9/platforms/android-21/arch-x86/usr/include/linux/pfkeyv2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pfkeyv2.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pfkeyv2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pg.h b/9/platforms/android-21/arch-x86/usr/include/linux/pg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h b/9/platforms/android-21/arch-x86/usr/include/linux/phantom.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/phantom.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/phantom.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h b/9/platforms/android-21/arch-x86/usr/include/linux/phonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/phonet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/phonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h b/9/platforms/android-21/arch-x86/usr/include/linux/pkt_cls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_cls.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pkt_cls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h b/9/platforms/android-21/arch-x86/usr/include/linux/pkt_sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pkt_sched.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pkt_sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h b/9/platforms/android-21/arch-x86/usr/include/linux/pktcdvd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pktcdvd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pktcdvd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h b/9/platforms/android-21/arch-x86/usr/include/linux/pmu.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pmu.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pmu.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/poll.h b/9/platforms/android-21/arch-x86/usr/include/linux/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/poll.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h b/9/platforms/android-21/arch-x86/usr/include/linux/posix_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/posix_types.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/posix_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h b/9/platforms/android-21/arch-x86/usr/include/linux/ppdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppdev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ppdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h b/9/platforms/android-21/arch-x86/usr/include/linux/ppp-comp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-comp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ppp-comp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/ppp-ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp-ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ppp-ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h b/9/platforms/android-21/arch-x86/usr/include/linux/ppp_defs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ppp_defs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ppp_defs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/pps.h b/9/platforms/android-21/arch-x86/usr/include/linux/pps.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/pps.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/pps.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/prctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h b/9/platforms/android-21/arch-x86/usr/include/linux/ptp_clock.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ptp_clock.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ptp_clock.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h b/9/platforms/android-21/arch-x86/usr/include/linux/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ptrace.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/qnx4_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/qnx4_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/qnx4_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h b/9/platforms/android-21/arch-x86/usr/include/linux/qnxtypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/qnxtypes.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/qnxtypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/quota.h b/9/platforms/android-21/arch-x86/usr/include/linux/quota.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/quota.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/quota.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h b/9/platforms/android-21/arch-x86/usr/include/linux/radeonfb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/radeonfb.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/radeonfb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h b/9/platforms/android-21/arch-x86/usr/include/linux/raid/md_p.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_p.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/raid/md_p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h b/9/platforms/android-21/arch-x86/usr/include/linux/raid/md_u.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raid/md_u.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/raid/md_u.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/random.h b/9/platforms/android-21/arch-x86/usr/include/linux/random.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/random.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/random.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/raw.h b/9/platforms/android-21/arch-x86/usr/include/linux/raw.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/raw.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/raw.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rds.h b/9/platforms/android-21/arch-x86/usr/include/linux/rds.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rds.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/rds.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h b/9/platforms/android-21/arch-x86/usr/include/linux/reboot.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reboot.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/reiserfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/reiserfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h b/9/platforms/android-21/arch-x86/usr/include/linux/reiserfs_xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/reiserfs_xattr.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/reiserfs_xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/resource.h b/9/platforms/android-21/arch-x86/usr/include/linux/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/resource.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h b/9/platforms/android-21/arch-x86/usr/include/linux/rfkill.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rfkill.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/rfkill.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/romfs_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/romfs_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/romfs_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rose.h b/9/platforms/android-21/arch-x86/usr/include/linux/rose.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rose.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/rose.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/route.h b/9/platforms/android-21/arch-x86/usr/include/linux/route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/route.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h b/9/platforms/android-21/arch-x86/usr/include/linux/rtc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rtc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/rtc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/rtnetlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/rtnetlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/rtnetlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/scc.h b/9/platforms/android-21/arch-x86/usr/include/linux/scc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/scc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/scc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sched.h b/9/platforms/android-21/arch-x86/usr/include/linux/sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sched.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h b/9/platforms/android-21/arch-x86/usr/include/linux/screen_info.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/screen_info.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/screen_info.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h b/9/platforms/android-21/arch-x86/usr/include/linux/sctp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sctp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sctp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h b/9/platforms/android-21/arch-x86/usr/include/linux/sdla.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sdla.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sdla.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h b/9/platforms/android-21/arch-x86/usr/include/linux/seccomp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/seccomp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/seccomp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h b/9/platforms/android-21/arch-x86/usr/include/linux/securebits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/securebits.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/securebits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h b/9/platforms/android-21/arch-x86/usr/include/linux/selinux_netlink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/selinux_netlink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/selinux_netlink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sem.h b/9/platforms/android-21/arch-x86/usr/include/linux/sem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sem.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial.h b/9/platforms/android-21/arch-x86/usr/include/linux/serial.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/serial.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h b/9/platforms/android-21/arch-x86/usr/include/linux/serial_core.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_core.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/serial_core.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h b/9/platforms/android-21/arch-x86/usr/include/linux/serial_reg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serial_reg.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/serial_reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/serio.h b/9/platforms/android-21/arch-x86/usr/include/linux/serio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/serio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/serio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/shm.h b/9/platforms/android-21/arch-x86/usr/include/linux/shm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/shm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signal.h b/9/platforms/android-21/arch-x86/usr/include/linux/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/signal.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h b/9/platforms/android-21/arch-x86/usr/include/linux/signalfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/signalfd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h b/9/platforms/android-21/arch-x86/usr/include/linux/snmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/snmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/snmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h b/9/platforms/android-21/arch-x86/usr/include/linux/sock_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sock_diag.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sock_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/socket.h b/9/platforms/android-21/arch-x86/usr/include/linux/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/socket.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h b/9/platforms/android-21/arch-x86/usr/include/linux/sockios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sockios.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sockios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/som.h b/9/platforms/android-21/arch-x86/usr/include/linux/som.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/som.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/som.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h b/9/platforms/android-21/arch-x86/usr/include/linux/sonet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sonet.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sonet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h b/9/platforms/android-21/arch-x86/usr/include/linux/sonypi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sonypi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sonypi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sound.h b/9/platforms/android-21/arch-x86/usr/include/linux/sound.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sound.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h b/9/platforms/android-21/arch-x86/usr/include/linux/soundcard.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/soundcard.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/soundcard.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h b/9/platforms/android-21/arch-x86/usr/include/linux/spi/spidev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/spi/spidev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/spi/spidev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stat.h b/9/platforms/android-21/arch-x86/usr/include/linux/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/stat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h b/9/platforms/android-21/arch-x86/usr/include/linux/stddef.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/stddef.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/stddef.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/string.h b/9/platforms/android-21/arch-x86/usr/include/linux/string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/string.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h b/9/platforms/android-21/arch-x86/usr/include/linux/sunrpc/debug.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sunrpc/debug.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sunrpc/debug.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h b/9/platforms/android-21/arch-x86/usr/include/linux/suspend_ioctls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/suspend_ioctls.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/suspend_ioctls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h b/9/platforms/android-21/arch-x86/usr/include/linux/sw_sync.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sw_sync.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sw_sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/swab.h b/9/platforms/android-21/arch-x86/usr/include/linux/swab.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/swab.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/swab.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sync.h b/9/platforms/android-21/arch-x86/usr/include/linux/sync.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sync.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sync.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h b/9/platforms/android-21/arch-x86/usr/include/linux/synclink.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/synclink.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/synclink.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h b/9/platforms/android-21/arch-x86/usr/include/linux/sysctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sysctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sysctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h b/9/platforms/android-21/arch-x86/usr/include/linux/sysinfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/sysinfo.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h b/9/platforms/android-21/arch-x86/usr/include/linux/taskstats.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/taskstats.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/taskstats.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_csum.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_csum.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_csum.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_defact.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_defact.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_defact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_gact.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_gact.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_gact.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_ipt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_ipt.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_ipt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_mirred.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_mirred.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_mirred.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_nat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_nat.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_nat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_pedit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_pedit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_pedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_skbedit.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_act/tc_skbedit.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_act/tc_skbedit.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_cmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_meta.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_meta.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_nbyte.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h b/9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tc_ematch/tc_em_text.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tc_ematch/tc_em_text.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h b/9/platforms/android-21/arch-x86/usr/include/linux/tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h b/9/platforms/android-21/arch-x86/usr/include/linux/tcp_metrics.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tcp_metrics.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tcp_metrics.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h b/9/platforms/android-21/arch-x86/usr/include/linux/telephony.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/telephony.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/telephony.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/termios.h b/9/platforms/android-21/arch-x86/usr/include/linux/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/termios.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/time.h b/9/platforms/android-21/arch-x86/usr/include/linux/time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/time.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/times.h b/9/platforms/android-21/arch-x86/usr/include/linux/times.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/times.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/timex.h b/9/platforms/android-21/arch-x86/usr/include/linux/timex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/timex.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h b/9/platforms/android-21/arch-x86/usr/include/linux/tiocl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tiocl.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tiocl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h b/9/platforms/android-21/arch-x86/usr/include/linux/tipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h b/9/platforms/android-21/arch-x86/usr/include/linux/tipc_config.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tipc_config.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tipc_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h b/9/platforms/android-21/arch-x86/usr/include/linux/toshiba.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/toshiba.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/toshiba.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty.h b/9/platforms/android-21/arch-x86/usr/include/linux/tty.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tty.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h b/9/platforms/android-21/arch-x86/usr/include/linux/tty_flags.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/tty_flags.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/tty_flags.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/types.h b/9/platforms/android-21/arch-x86/usr/include/linux/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/types.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h b/9/platforms/android-21/arch-x86/usr/include/linux/udf_fs_i.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/udf_fs_i.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/udf_fs_i.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/udp.h b/9/platforms/android-21/arch-x86/usr/include/linux/udp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/udp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h b/9/platforms/android-21/arch-x86/usr/include/linux/uhid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uhid.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/uhid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h b/9/platforms/android-21/arch-x86/usr/include/linux/uinput.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uinput.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/uinput.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uio.h b/9/platforms/android-21/arch-x86/usr/include/linux/uio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h b/9/platforms/android-21/arch-x86/usr/include/linux/ultrasound.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/ultrasound.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/ultrasound.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/un.h b/9/platforms/android-21/arch-x86/usr/include/linux/un.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/un.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h b/9/platforms/android-21/arch-x86/usr/include/linux/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/unistd.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h b/9/platforms/android-21/arch-x86/usr/include/linux/unix_diag.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/unix_diag.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/unix_diag.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/audio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/audio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/audio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/cdc-wdm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc-wdm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/cdc-wdm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/cdc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/cdc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/cdc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/ch11.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch11.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/ch11.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/ch9.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/ch9.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/ch9.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/f_accessory.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_accessory.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/f_accessory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/f_mtp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/f_mtp.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/f_mtp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/functionfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/functionfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/functionfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/g_printer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/g_printer.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/g_printer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/gadgetfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/gadgetfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/gadgetfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/midi.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/midi.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/midi.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/tmc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/tmc.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/tmc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h b/9/platforms/android-21/arch-x86/usr/include/linux/usb/video.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usb/video.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usb/video.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h b/9/platforms/android-21/arch-x86/usr/include/linux/usbdevice_fs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/usbdevice_fs.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/usbdevice_fs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utime.h b/9/platforms/android-21/arch-x86/usr/include/linux/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/utime.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h b/9/platforms/android-21/arch-x86/usr/include/linux/utsname.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/utsname.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h b/9/platforms/android-21/arch-x86/usr/include/linux/uuid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uuid.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/uuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h b/9/platforms/android-21/arch-x86/usr/include/linux/uvcvideo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/uvcvideo.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/uvcvideo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h b/9/platforms/android-21/arch-x86/usr/include/linux/v4l2-common.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-common.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/v4l2-common.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h b/9/platforms/android-21/arch-x86/usr/include/linux/v4l2-controls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-controls.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/v4l2-controls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h b/9/platforms/android-21/arch-x86/usr/include/linux/v4l2-dv-timings.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-dv-timings.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/v4l2-dv-timings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h b/9/platforms/android-21/arch-x86/usr/include/linux/v4l2-mediabus.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-mediabus.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/v4l2-mediabus.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h b/9/platforms/android-21/arch-x86/usr/include/linux/v4l2-subdev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/v4l2-subdev.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/v4l2-subdev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/version.h b/9/platforms/android-21/arch-x86/usr/include/linux/version.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/version.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/version.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/veth.h b/9/platforms/android-21/arch-x86/usr/include/linux/veth.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/veth.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/veth.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h b/9/platforms/android-21/arch-x86/usr/include/linux/vfio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vfio.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/vfio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h b/9/platforms/android-21/arch-x86/usr/include/linux/vhost.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vhost.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/vhost.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h b/9/platforms/android-21/arch-x86/usr/include/linux/videodev2.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/videodev2.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/videodev2.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_9p.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_9p.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_9p.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_balloon.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_balloon.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_balloon.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_blk.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_blk.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_blk.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_config.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_config.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_config.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_console.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_console.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_console.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_ids.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ids.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_net.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_net.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_net.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_pci.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_pci.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_pci.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_ring.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_ring.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_ring.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h b/9/platforms/android-21/arch-x86/usr/include/linux/virtio_rng.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/virtio_rng.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/virtio_rng.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h b/9/platforms/android-21/arch-x86/usr/include/linux/vm_sockets.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vm_sockets.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/vm_sockets.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h b/9/platforms/android-21/arch-x86/usr/include/linux/vsp1.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vsp1.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/vsp1.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/vt.h b/9/platforms/android-21/arch-x86/usr/include/linux/vt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/vt.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wait.h b/9/platforms/android-21/arch-x86/usr/include/linux/wait.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wait.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h b/9/platforms/android-21/arch-x86/usr/include/linux/wanrouter.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wanrouter.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/wanrouter.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h b/9/platforms/android-21/arch-x86/usr/include/linux/watchdog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/watchdog.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/watchdog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h b/9/platforms/android-21/arch-x86/usr/include/linux/wimax.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/wimax.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h b/9/platforms/android-21/arch-x86/usr/include/linux/wimax/i2400m.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wimax/i2400m.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/wimax/i2400m.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h b/9/platforms/android-21/arch-x86/usr/include/linux/wireless.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/wireless.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/wireless.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/x25.h b/9/platforms/android-21/arch-x86/usr/include/linux/x25.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/x25.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/x25.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h b/9/platforms/android-21/arch-x86/usr/include/linux/xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/xattr.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h b/9/platforms/android-21/arch-x86/usr/include/linux/xfrm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/xfrm.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/xfrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h b/9/platforms/android-21/arch-x86/usr/include/linux/zorro.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/zorro.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h b/9/platforms/android-21/arch-x86/usr/include/linux/zorro_ids.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/zorro_ids.h
copy to 9/platforms/android-21/arch-x86/usr/include/linux/zorro_ids.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/locale.h b/9/platforms/android-21/arch-x86/usr/include/locale.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/locale.h
copy to 9/platforms/android-21/arch-x86/usr/include/locale.h
diff --git a/9/platforms/android-21/arch-x86/usr/include/machine/asm.h b/9/platforms/android-21/arch-x86/usr/include/machine/asm.h
new file mode 100644
index 0000000..672493d
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/include/machine/asm.h
@@ -0,0 +1,63 @@
+/*	$NetBSD: asm.h,v 1.40 2011/06/16 13:16:20 joerg Exp $	*/
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)asm.h	5.5 (Berkeley) 5/7/91
+ */
+
+#ifndef _I386_ASM_H_
+#define _I386_ASM_H_
+
+#define PIC_PROLOGUE	\
+	pushl	%ebx;	\
+	call	666f;	\
+666:			\
+	popl	%ebx;	\
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-666b], %ebx
+#define PIC_EPILOGUE	\
+	popl	%ebx
+#define PIC_PLT(x)	x@PLT
+#define PIC_GOT(x)	x@GOT(%ebx)
+#define PIC_GOTOFF(x)	x@GOTOFF(%ebx)
+
+/* let kernels and others override entrypoint alignment */
+#if !defined(_ALIGN_TEXT) && !defined(_KERNEL)
+# ifdef _STANDALONE
+#  define _ALIGN_TEXT .align 1
+# elif defined __ELF__
+#  define _ALIGN_TEXT .align 16
+# else
+#  define _ALIGN_TEXT .align 4
+# endif
+#endif
+
+#endif /* !_I386_ASM_H_ */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/i386/elf_machdep.h b/9/platforms/android-21/arch-x86/usr/include/machine/elf_machdep.h
similarity index 100%
copy from 9/platforms/android-19/arch-x86_64/usr/include/i386/elf_machdep.h
copy to 9/platforms/android-21/arch-x86/usr/include/machine/elf_machdep.h
diff --git a/9/platforms/android-21/arch-x86/usr/include/machine/endian.h b/9/platforms/android-21/arch-x86/usr/include/machine/endian.h
new file mode 100644
index 0000000..e1506b1
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/include/machine/endian.h
@@ -0,0 +1,61 @@
+/*	$OpenBSD: endian.h,v 1.17 2011/03/12 04:03:04 guenther Exp $	*/
+
+/*-
+ * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE_ENDIAN_H_
+#define _MACHINE_ENDIAN_H_
+
+#ifdef __GNUC__
+
+#define	__swap32md(x) __statement({					\
+	uint32_t __swap32md_x = (x);					\
+									\
+	__asm ("bswap %0" : "+r" (__swap32md_x));			\
+	__swap32md_x;							\
+})
+
+#define	__swap64md(x) __statement({					\
+	uint64_t __swap64md_x = (x);					\
+									\
+	(uint64_t)__swap32md(__swap64md_x >> 32) |			\
+	    (uint64_t)__swap32md(__swap64md_x & 0xffffffff) << 32;	\
+})
+#define	__swap16md(x) __statement({					\
+	uint16_t __swap16md_x = (x);					\
+									\
+	__asm ("rorw $8, %w0" : "+r" (__swap16md_x));			\
+	__swap16md_x;							\
+})
+
+/* Tell sys/endian.h we have MD variants of the swap macros.  */
+#define MD_SWAP
+
+#endif	/* __GNUC__ */
+
+#define _BYTE_ORDER _LITTLE_ENDIAN
+#include <sys/types.h>
+#include <sys/endian.h>
+
+#endif /* _MACHINE_ENDIAN_H_ */
diff --git a/9/platforms/android-21/arch-x86/usr/include/machine/exec.h b/9/platforms/android-21/arch-x86/usr/include/machine/exec.h
new file mode 100644
index 0000000..d091741
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/include/machine/exec.h
@@ -0,0 +1,51 @@
+/*	$OpenBSD: exec.h,v 1.9 2003/04/17 03:42:14 drahn Exp $	*/
+/*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1993 Christopher G. Demetriou
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _I386_EXEC_H_
+#define _I386_EXEC_H_
+
+#define __LDPGSZ	4096
+
+#define NATIVE_EXEC_ELF
+
+#define ARCH_ELFSIZE		32
+
+#define ELF_TARG_CLASS		ELFCLASS32
+#define ELF_TARG_DATA		ELFDATA2LSB
+#define ELF_TARG_MACH		EM_386 /* XXX - EM_486 is currently unused
+                                          by all OSs/compilers/linkers */
+
+#define _NLIST_DO_AOUT
+#define _NLIST_DO_ELF
+
+#define _KERN_DO_AOUT
+#define _KERN_DO_ELF
+
+#endif  /* _I386_EXEC_H_ */
diff --git a/9/platforms/android-21/arch-x86/usr/include/machine/fenv.h b/9/platforms/android-21/arch-x86/usr/include/machine/fenv.h
new file mode 100644
index 0000000..de45add
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/include/machine/fenv.h
@@ -0,0 +1,69 @@
+/*-
+ * Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/lib/msun/i387/fenv.h,v 1.4 2005/03/17 22:21:46 das Exp $
+ */
+
+#ifndef _I387_FENV_H_
+#define _I387_FENV_H_
+
+#include <sys/types.h>
+
+__BEGIN_DECLS
+
+/*
+ * To preserve binary compatibility with FreeBSD 5.3, we pack the
+ * mxcsr into some reserved fields, rather than changing sizeof(fenv_t).
+ */
+typedef struct {
+  __uint16_t __control;
+  __uint16_t __mxcsr_hi;
+  __uint16_t __status;
+  __uint16_t __mxcsr_lo;
+  __uint32_t __tag;
+  char       __other[16];
+} fenv_t;
+
+typedef __uint16_t fexcept_t;
+
+/* Exception flags */
+#define FE_INVALID    0x01
+#define FE_DENORMAL   0x02
+#define FE_DIVBYZERO  0x04
+#define FE_OVERFLOW   0x08
+#define FE_UNDERFLOW  0x10
+#define FE_INEXACT    0x20
+#define FE_ALL_EXCEPT (FE_DIVBYZERO | FE_DENORMAL | FE_INEXACT | \
+                       FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
+
+/* Rounding modes */
+#define FE_TONEAREST  0x0000
+#define FE_DOWNWARD   0x0400
+#define FE_UPWARD     0x0800
+#define FE_TOWARDZERO 0x0c00
+
+__END_DECLS
+
+#endif /* !I387_FENV_H_ */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h b/9/platforms/android-21/arch-x86/usr/include/machine/ieee.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/machine/ieee.h
copy to 9/platforms/android-21/arch-x86/usr/include/machine/ieee.h
diff --git a/9/platforms/android-21/arch-x86/usr/include/machine/setjmp.h b/9/platforms/android-21/arch-x86/usr/include/machine/setjmp.h
new file mode 100644
index 0000000..ded095d
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/include/machine/setjmp.h
@@ -0,0 +1,8 @@
+/*	$OpenBSD: setjmp.h,v 1.2 2000/08/05 22:07:32 niklas Exp $	*/
+/*	$NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:43 cgd Exp $	*/
+
+/*
+ * machine/setjmp.h: machine dependent setjmp-related information.
+ */
+
+#define	_JBLEN	10		/* size, in longs, of a jmp_buf */
diff --git a/9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h b/9/platforms/android-21/arch-x86/usr/include/machine/wchar_limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/machine/wchar_limits.h
copy to 9/platforms/android-21/arch-x86/usr/include/machine/wchar_limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/malloc.h b/9/platforms/android-21/arch-x86/usr/include/malloc.h
similarity index 85%
copy from 9/platforms/android-19/arch-arm64/usr/include/malloc.h
copy to 9/platforms/android-21/arch-x86/usr/include/malloc.h
index 1e92b7d..e6ea276 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/malloc.h
+++ b/9/platforms/android-21/arch-x86/usr/include/malloc.h
@@ -27,19 +27,12 @@
 
 __BEGIN_DECLS
 
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
 extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
 extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
 extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
 extern void free(void* p);
+
+extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
 #ifndef STRUCT_MALLINFO_DECLARED
diff --git a/9/platforms/android-19/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-x86/usr/include/math.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/math.h
copy to 9/platforms/android-21/arch-x86/usr/include/math.h
index 8369d6e..e872388 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-x86/usr/include/math.h
@@ -512,7 +512,8 @@
 double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
 double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
 int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
+/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
 int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaCodec.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCodec.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaCodec.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaCrypto.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaCrypto.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaCrypto.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaDrm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaDrm.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaDrm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaError.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaError.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaError.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaExtractor.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaExtractor.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaExtractor.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaFormat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaFormat.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaFormat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h b/9/platforms/android-21/arch-x86/usr/include/media/NdkMediaMuxer.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/media/NdkMediaMuxer.h
copy to 9/platforms/android-21/arch-x86/usr/include/media/NdkMediaMuxer.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/memory.h b/9/platforms/android-21/arch-x86/usr/include/memory.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/memory.h
copy to 9/platforms/android-21/arch-x86/usr/include/memory.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/mntent.h b/9/platforms/android-21/arch-x86/usr/include/mntent.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/mntent.h
copy to 9/platforms/android-21/arch-x86/usr/include/mntent.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h b/9/platforms/android-21/arch-x86/usr/include/net/ethernet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/ethernet.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/ethernet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h b/9/platforms/android-21/arch-x86/usr/include/net/ethertypes.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/ethertypes.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/ethertypes.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if.h b/9/platforms/android-21/arch-x86/usr/include/net/if.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/if.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h b/9/platforms/android-21/arch-x86/usr/include/net/if_arp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_arp.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/if_arp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h b/9/platforms/android-21/arch-x86/usr/include/net/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_ether.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h b/9/platforms/android-21/arch-x86/usr/include/net/if_ieee1394.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_ieee1394.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/if_ieee1394.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h b/9/platforms/android-21/arch-x86/usr/include/net/if_packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_packet.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/if_packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/if_types.h b/9/platforms/android-21/arch-x86/usr/include/net/if_types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/if_types.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/if_types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/net/route.h b/9/platforms/android-21/arch-x86/usr/include/net/route.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/net/route.h
copy to 9/platforms/android-21/arch-x86/usr/include/net/route.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netdb.h b/9/platforms/android-21/arch-x86/usr/include/netdb.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netdb.h
copy to 9/platforms/android-21/arch-x86/usr/include/netdb.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h b/9/platforms/android-21/arch-x86/usr/include/netinet/ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ether.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h b/9/platforms/android-21/arch-x86/usr/include/netinet/icmp6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/icmp6.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/icmp6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h b/9/platforms/android-21/arch-x86/usr/include/netinet/if_ether.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/if_ether.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/if_ether.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in.h b/9/platforms/android-21/arch-x86/usr/include/netinet/in.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/in.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h b/9/platforms/android-21/arch-x86/usr/include/netinet/in6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in6.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/in6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h b/9/platforms/android-21/arch-x86/usr/include/netinet/in_systm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/in_systm.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/in_systm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h b/9/platforms/android-21/arch-x86/usr/include/netinet/ip.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/ip.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h b/9/platforms/android-21/arch-x86/usr/include/netinet/ip6.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip6.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/ip6.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h b/9/platforms/android-21/arch-x86/usr/include/netinet/ip_icmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/ip_icmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/ip_icmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h b/9/platforms/android-21/arch-x86/usr/include/netinet/tcp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/tcp.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/tcp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h b/9/platforms/android-21/arch-x86/usr/include/netinet/udp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netinet/udp.h
copy to 9/platforms/android-21/arch-x86/usr/include/netinet/udp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h b/9/platforms/android-21/arch-x86/usr/include/netpacket/packet.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/netpacket/packet.h
copy to 9/platforms/android-21/arch-x86/usr/include/netpacket/packet.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/nsswitch.h b/9/platforms/android-21/arch-x86/usr/include/nsswitch.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/nsswitch.h
copy to 9/platforms/android-21/arch-x86/usr/include/nsswitch.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pathconf.h b/9/platforms/android-21/arch-x86/usr/include/pathconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pathconf.h
copy to 9/platforms/android-21/arch-x86/usr/include/pathconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/paths.h b/9/platforms/android-21/arch-x86/usr/include/paths.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/paths.h
copy to 9/platforms/android-21/arch-x86/usr/include/paths.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/poll.h b/9/platforms/android-21/arch-x86/usr/include/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/poll.h
copy to 9/platforms/android-21/arch-x86/usr/include/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pthread.h b/9/platforms/android-21/arch-x86/usr/include/pthread.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pthread.h
copy to 9/platforms/android-21/arch-x86/usr/include/pthread.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/pwd.h b/9/platforms/android-21/arch-x86/usr/include/pwd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/pwd.h
copy to 9/platforms/android-21/arch-x86/usr/include/pwd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/regex.h b/9/platforms/android-21/arch-x86/usr/include/regex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/regex.h
copy to 9/platforms/android-21/arch-x86/usr/include/regex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/resolv.h b/9/platforms/android-21/arch-x86/usr/include/resolv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/resolv.h
copy to 9/platforms/android-21/arch-x86/usr/include/resolv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sched.h b/9/platforms/android-21/arch-x86/usr/include/sched.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sched.h
copy to 9/platforms/android-21/arch-x86/usr/include/sched.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/search.h b/9/platforms/android-21/arch-x86/usr/include/search.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/search.h
copy to 9/platforms/android-21/arch-x86/usr/include/search.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/semaphore.h b/9/platforms/android-21/arch-x86/usr/include/semaphore.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/semaphore.h
copy to 9/platforms/android-21/arch-x86/usr/include/semaphore.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/setjmp.h b/9/platforms/android-21/arch-x86/usr/include/setjmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/setjmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/setjmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgidefs.h b/9/platforms/android-21/arch-x86/usr/include/sgidefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sgidefs.h
copy to 9/platforms/android-21/arch-x86/usr/include/sgidefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sgtty.h b/9/platforms/android-21/arch-x86/usr/include/sgtty.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sgtty.h
copy to 9/platforms/android-21/arch-x86/usr/include/sgtty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/signal.h b/9/platforms/android-21/arch-x86/usr/include/signal.h
similarity index 98%
copy from 9/platforms/android-19/arch-arm64/usr/include/signal.h
copy to 9/platforms/android-21/arch-x86/usr/include/signal.h
index f1849c5..e23e65b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/signal.h
+++ b/9/platforms/android-21/arch-x86/usr/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
copy to 9/platforms/android-21/arch-x86/usr/include/stdatomic.h
index 3db25a7..58cb1bc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-x86/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
@@ -89,6 +89,7 @@
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_consume;
+using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdint.h b/9/platforms/android-21/arch-x86/usr/include/stdint.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdint.h
copy to 9/platforms/android-21/arch-x86/usr/include/stdint.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdio.h b/9/platforms/android-21/arch-x86/usr/include/stdio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdio.h
copy to 9/platforms/android-21/arch-x86/usr/include/stdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-21/arch-x86/usr/include/stdlib.h
similarity index 96%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdlib.h
copy to 9/platforms/android-21/arch-x86/usr/include/stdlib.h
index a0f017c..e04475c 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h
+++ b/9/platforms/android-21/arch-x86/usr/include/stdlib.h
@@ -76,8 +76,8 @@
 extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
 
 extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
+extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
+extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
 
 extern int atoi(const char*) __purefunc;
 extern long atol(const char*) __purefunc;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/string.h b/9/platforms/android-21/arch-x86/usr/include/string.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/string.h
copy to 9/platforms/android-21/arch-x86/usr/include/string.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/strings.h b/9/platforms/android-21/arch-x86/usr/include/strings.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/strings.h
copy to 9/platforms/android-21/arch-x86/usr/include/strings.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h b/9/platforms/android-21/arch-x86/usr/include/sys/auxv.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/auxv.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/auxv.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h b/9/platforms/android-21/arch-x86/usr/include/sys/cachectl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cachectl.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/cachectl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/capability.h b/9/platforms/android-21/arch-x86/usr/include/sys/capability.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/capability.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/capability.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h b/9/platforms/android-21/arch-x86/usr/include/sys/cdefs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/cdefs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h b/9/platforms/android-21/arch-x86/usr/include/sys/cdefs_elf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/cdefs_elf.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/cdefs_elf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/endian.h b/9/platforms/android-21/arch-x86/usr/include/sys/endian.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/endian.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/endian.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h b/9/platforms/android-21/arch-x86/usr/include/sys/epoll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/epoll.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/epoll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/errno.h b/9/platforms/android-21/arch-x86/usr/include/sys/errno.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/errno.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/errno.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h b/9/platforms/android-21/arch-x86/usr/include/sys/eventfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/eventfd.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/eventfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/file.h b/9/platforms/android-21/arch-x86/usr/include/sys/file.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/file.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/file.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h b/9/platforms/android-21/arch-x86/usr/include/sys/fsuid.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/fsuid.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/fsuid.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h b/9/platforms/android-21/arch-x86/usr/include/sys/glibc-syscalls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/glibc-syscalls.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/glibc-syscalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h b/9/platforms/android-21/arch-x86/usr/include/sys/inotify.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/inotify.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h b/9/platforms/android-21/arch-x86/usr/include/sys/ioctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ioctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h b/9/platforms/android-21/arch-x86/usr/include/sys/ioctl_compat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ioctl_compat.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ioctl_compat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h b/9/platforms/android-21/arch-x86/usr/include/sys/ipc.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ipc.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ipc.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/klog.h b/9/platforms/android-21/arch-x86/usr/include/sys/klog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/klog.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/klog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/limits.h b/9/platforms/android-21/arch-x86/usr/include/sys/limits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/limits.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mman.h b/9/platforms/android-21/arch-x86/usr/include/sys/mman.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/mman.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/mman.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/mount.h b/9/platforms/android-21/arch-x86/usr/include/sys/mount.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/mount.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/mount.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/msg.h b/9/platforms/android-21/arch-x86/usr/include/sys/msg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/msg.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/msg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/param.h b/9/platforms/android-21/arch-x86/usr/include/sys/param.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/param.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/param.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/personality.h b/9/platforms/android-21/arch-x86/usr/include/sys/personality.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/personality.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/personality.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/poll.h b/9/platforms/android-21/arch-x86/usr/include/sys/poll.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/poll.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/poll.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h b/9/platforms/android-21/arch-x86/usr/include/sys/prctl.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/prctl.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/prctl.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h b/9/platforms/android-21/arch-x86/usr/include/sys/ptrace.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ptrace.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ptrace.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/queue.h b/9/platforms/android-21/arch-x86/usr/include/sys/queue.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/queue.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/queue.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h b/9/platforms/android-21/arch-x86/usr/include/sys/reboot.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/reboot.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/reboot.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/reg.h b/9/platforms/android-21/arch-x86/usr/include/sys/reg.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/reg.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/reg.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/resource.h b/9/platforms/android-21/arch-x86/usr/include/sys/resource.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/resource.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/resource.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/select.h b/9/platforms/android-21/arch-x86/usr/include/sys/select.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/select.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/select.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sem.h b/9/platforms/android-21/arch-x86/usr/include/sys/sem.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sem.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/sem.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h b/9/platforms/android-21/arch-x86/usr/include/sys/sendfile.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sendfile.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/sendfile.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/shm.h b/9/platforms/android-21/arch-x86/usr/include/sys/shm.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/shm.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/shm.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signal.h b/9/platforms/android-21/arch-x86/usr/include/sys/signal.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/signal.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/signal.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h b/9/platforms/android-21/arch-x86/usr/include/sys/signalfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/signalfd.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/signalfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socket.h b/9/platforms/android-21/arch-x86/usr/include/sys/socket.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/socket.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/socket.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h b/9/platforms/android-21/arch-x86/usr/include/sys/socketcalls.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/socketcalls.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/socketcalls.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/stat.h b/9/platforms/android-21/arch-x86/usr/include/sys/stat.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/stat.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/stat.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h b/9/platforms/android-21/arch-x86/usr/include/sys/statfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/statfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/statfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h b/9/platforms/android-21/arch-x86/usr/include/sys/statvfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/statvfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/statvfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/swap.h b/9/platforms/android-21/arch-x86/usr/include/sys/swap.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/swap.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/swap.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h b/9/platforms/android-21/arch-x86/usr/include/sys/syscall.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/syscall.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/syscall.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h b/9/platforms/android-21/arch-x86/usr/include/sys/sysconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysconf.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/sysconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h b/9/platforms/android-21/arch-x86/usr/include/sys/sysinfo.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysinfo.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/sysinfo.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h b/9/platforms/android-21/arch-x86/usr/include/sys/syslimits.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/syslimits.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/syslimits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h b/9/platforms/android-21/arch-x86/usr/include/sys/sysmacros.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/sysmacros.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/sysmacros.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h b/9/platforms/android-21/arch-x86/usr/include/sys/system_properties.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/system_properties.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/system_properties.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/time.h b/9/platforms/android-21/arch-x86/usr/include/sys/time.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/time.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/time.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h b/9/platforms/android-21/arch-x86/usr/include/sys/timerfd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/timerfd.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/timerfd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/times.h b/9/platforms/android-21/arch-x86/usr/include/sys/times.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/times.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/times.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/timex.h b/9/platforms/android-21/arch-x86/usr/include/sys/timex.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/timex.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/timex.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h b/9/platforms/android-21/arch-x86/usr/include/sys/ttychars.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttychars.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ttychars.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h b/9/platforms/android-21/arch-x86/usr/include/sys/ttydefaults.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydefaults.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ttydefaults.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h b/9/platforms/android-21/arch-x86/usr/include/sys/ttydev.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ttydev.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ttydev.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/types.h b/9/platforms/android-21/arch-x86/usr/include/sys/types.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/types.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/types.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-x86/usr/include/sys/ucontext.h
similarity index 95%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/ucontext.h
index f62380d..dd2a0bb 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-21/arch-x86/usr/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -80,6 +78,10 @@
 
 #elif defined(__aarch64__)
 
+#define NGREG 34 /* x0..x30 + sp + pc + pstate */
+typedef unsigned long greg_t;
+typedef greg_t gregset_t[NGREG];
+
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -152,11 +154,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/uio.h b/9/platforms/android-21/arch-x86/usr/include/sys/uio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/uio.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/uio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/un.h b/9/platforms/android-21/arch-x86/usr/include/sys/un.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/un.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/un.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/user.h b/9/platforms/android-21/arch-x86/usr/include/sys/user.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/user.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/user.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utime.h b/9/platforms/android-21/arch-x86/usr/include/sys/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/utime.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h b/9/platforms/android-21/arch-x86/usr/include/sys/utsname.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/utsname.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/utsname.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h b/9/platforms/android-21/arch-x86/usr/include/sys/vfs.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/vfs.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/vfs.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/vt.h b/9/platforms/android-21/arch-x86/usr/include/sys/vt.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/vt.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/vt.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/wait.h b/9/platforms/android-21/arch-x86/usr/include/sys/wait.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/wait.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/wait.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h b/9/platforms/android-21/arch-x86/usr/include/sys/xattr.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/sys/xattr.h
copy to 9/platforms/android-21/arch-x86/usr/include/sys/xattr.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/syslog.h b/9/platforms/android-21/arch-x86/usr/include/syslog.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/syslog.h
copy to 9/platforms/android-21/arch-x86/usr/include/syslog.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termio.h b/9/platforms/android-21/arch-x86/usr/include/termio.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/termio.h
copy to 9/platforms/android-21/arch-x86/usr/include/termio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/termios.h b/9/platforms/android-21/arch-x86/usr/include/termios.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/termios.h
copy to 9/platforms/android-21/arch-x86/usr/include/termios.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/thread_db.h b/9/platforms/android-21/arch-x86/usr/include/thread_db.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/thread_db.h
copy to 9/platforms/android-21/arch-x86/usr/include/thread_db.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time.h b/9/platforms/android-21/arch-x86/usr/include/time.h
similarity index 91%
copy from 9/platforms/android-19/arch-arm64/usr/include/time.h
copy to 9/platforms/android-21/arch-x86/usr/include/time.h
index 0a5f18b..aa72fcc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/time.h
+++ b/9/platforms/android-21/arch-x86/usr/include/time.h
@@ -85,8 +85,10 @@
 
 extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
 
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__;
 
 extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
 extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time64.h b/9/platforms/android-21/arch-x86/usr/include/time64.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/time64.h
copy to 9/platforms/android-21/arch-x86/usr/include/time64.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/uchar.h b/9/platforms/android-21/arch-x86/usr/include/uchar.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/uchar.h
copy to 9/platforms/android-21/arch-x86/usr/include/uchar.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/ucontext.h b/9/platforms/android-21/arch-x86/usr/include/ucontext.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/ucontext.h
copy to 9/platforms/android-21/arch-x86/usr/include/ucontext.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/unistd.h b/9/platforms/android-21/arch-x86/usr/include/unistd.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/unistd.h
copy to 9/platforms/android-21/arch-x86/usr/include/unistd.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/util.h b/9/platforms/android-21/arch-x86/usr/include/util.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/util.h
copy to 9/platforms/android-21/arch-x86/usr/include/util.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utime.h b/9/platforms/android-21/arch-x86/usr/include/utime.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/utime.h
copy to 9/platforms/android-21/arch-x86/usr/include/utime.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/utmp.h b/9/platforms/android-21/arch-x86/usr/include/utmp.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/utmp.h
copy to 9/platforms/android-21/arch-x86/usr/include/utmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-21/arch-x86/usr/include/wchar.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/wchar.h
copy to 9/platforms/android-21/arch-x86/usr/include/wchar.h
index f421d4c..cfa9b74 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-21/arch-x86/usr/include/wchar.h
@@ -151,8 +151,8 @@
 extern int               wprintf(const wchar_t *, ...);
 extern int               wscanf(const wchar_t *, ...);
 
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
+extern long long          wcstoll_l(const wchar_t *, wchar_t **, int, locale_t);
+extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t);
 extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
 
 extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wctype.h b/9/platforms/android-21/arch-x86/usr/include/wctype.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/wctype.h
copy to 9/platforms/android-21/arch-x86/usr/include/wctype.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/xlocale.h b/9/platforms/android-21/arch-x86/usr/include/xlocale.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/xlocale.h
copy to 9/platforms/android-21/arch-x86/usr/include/xlocale.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zconf.h b/9/platforms/android-21/arch-x86/usr/include/zconf.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/zconf.h
copy to 9/platforms/android-21/arch-x86/usr/include/zconf.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/zlib.h b/9/platforms/android-21/arch-x86/usr/include/zlib.h
similarity index 100%
copy from 9/platforms/android-19/arch-arm64/usr/include/zlib.h
copy to 9/platforms/android-21/arch-x86/usr/include/zlib.h
diff --git a/9/platforms/android-21/arch-x86/usr/lib/crtbegin_dynamic.o b/9/platforms/android-21/arch-x86/usr/lib/crtbegin_dynamic.o
new file mode 100644
index 0000000..8dfc682
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/crtbegin_so.o b/9/platforms/android-21/arch-x86/usr/lib/crtbegin_so.o
new file mode 100644
index 0000000..b0cc7b7
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/crtbegin_static.o b/9/platforms/android-21/arch-x86/usr/lib/crtbegin_static.o
new file mode 100644
index 0000000..5a255a1
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/crtend_android.o b/9/platforms/android-21/arch-x86/usr/lib/crtend_android.o
new file mode 100644
index 0000000..173dad3
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/crtend_so.o b/9/platforms/android-21/arch-x86/usr/lib/crtend_so.o
new file mode 100644
index 0000000..6373e2a
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libEGL.so b/9/platforms/android-21/arch-x86/usr/lib/libEGL.so
new file mode 100755
index 0000000..9326643
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libEGL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libGLESv1_CM.so b/9/platforms/android-21/arch-x86/usr/lib/libGLESv1_CM.so
new file mode 100755
index 0000000..21d780a
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libGLESv2.so b/9/platforms/android-21/arch-x86/usr/lib/libGLESv2.so
new file mode 100755
index 0000000..6f180a6
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libGLESv3.so b/9/platforms/android-21/arch-x86/usr/lib/libGLESv3.so
new file mode 100755
index 0000000..f5bb04e
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libOpenMAXAL.so b/9/platforms/android-21/arch-x86/usr/lib/libOpenMAXAL.so
new file mode 100755
index 0000000..f040bbf
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libOpenSLES.so b/9/platforms/android-21/arch-x86/usr/lib/libOpenSLES.so
new file mode 100755
index 0000000..1615fb5
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libandroid.so b/9/platforms/android-21/arch-x86/usr/lib/libandroid.so
new file mode 100755
index 0000000..807922e
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libandroid.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libc.a b/9/platforms/android-21/arch-x86/usr/lib/libc.a
new file mode 100644
index 0000000..94a33f3
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libc.so b/9/platforms/android-21/arch-x86/usr/lib/libc.so
new file mode 100755
index 0000000..ebcb9a1
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libc.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libdl.so b/9/platforms/android-21/arch-x86/usr/lib/libdl.so
new file mode 100755
index 0000000..a0a2f8f
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libdl.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libjnigraphics.so b/9/platforms/android-21/arch-x86/usr/lib/libjnigraphics.so
new file mode 100755
index 0000000..169570f
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/liblog.so b/9/platforms/android-21/arch-x86/usr/lib/liblog.so
new file mode 100755
index 0000000..cd575bb
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/liblog.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libm.a b/9/platforms/android-21/arch-x86/usr/lib/libm.a
new file mode 100644
index 0000000..a944a6a
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libm.a
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libm.so b/9/platforms/android-21/arch-x86/usr/lib/libm.so
new file mode 100755
index 0000000..cb7f427
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libm.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libmediandk.so b/9/platforms/android-21/arch-x86/usr/lib/libmediandk.so
new file mode 100755
index 0000000..692bc76
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libstdc++.a b/9/platforms/android-21/arch-x86/usr/lib/libstdc++.a
new file mode 100644
index 0000000..4565d3f
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libstdc++.so b/9/platforms/android-21/arch-x86/usr/lib/libstdc++.so
new file mode 100755
index 0000000..722259d
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libz.a b/9/platforms/android-21/arch-x86/usr/lib/libz.a
new file mode 100644
index 0000000..6ea48c6
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libz.a
Binary files differ
diff --git a/9/platforms/android-21/arch-x86/usr/lib/libz.so b/9/platforms/android-21/arch-x86/usr/lib/libz.so
new file mode 100755
index 0000000..9e6955d
--- /dev/null
+++ b/9/platforms/android-21/arch-x86/usr/lib/libz.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/EGL/egl.h b/9/platforms/android-21/arch-x86_64/usr/include/EGL/egl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/EGL/egl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/EGL/egl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/EGL/eglext.h b/9/platforms/android-21/arch-x86_64/usr/include/EGL/eglext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/EGL/eglext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/EGL/eglext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/EGL/eglplatform.h b/9/platforms/android-21/arch-x86_64/usr/include/EGL/eglplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/EGL/eglplatform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/EGL/eglplatform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES/gl.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES/gl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES/gl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES/gl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES/glext.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES/glext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES/glext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES/glext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES/glplatform.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES/glplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES/glplatform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES/glplatform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES2/gl2.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES2/gl2.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES2/gl2.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES2/gl2.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES2/gl2ext.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES2/gl2ext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES2/gl2ext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES2/gl2ext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES2/gl2platform.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES2/gl2platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES2/gl2platform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES2/gl2platform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl3.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl3.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl3.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl3.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl31.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl31.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl31.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl31.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl3ext.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl3ext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl3ext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl3ext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl3platform.h b/9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl3platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/GLES3/gl3platform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/GLES3/gl3platform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/KHR/khrplatform.h b/9/platforms/android-21/arch-x86_64/usr/include/KHR/khrplatform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/KHR/khrplatform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/KHR/khrplatform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/OMXAL/OpenMAXAL.h b/9/platforms/android-21/arch-x86_64/usr/include/OMXAL/OpenMAXAL.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/OMXAL/OpenMAXAL.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/OMXAL/OpenMAXAL.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Android.h b/9/platforms/android-21/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Android.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Android.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Android.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Platform.h b/9/platforms/android-21/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Platform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/OMXAL/OpenMAXAL_Platform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES.h b/9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_Android.h b/9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_Android.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_Android.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_Android.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_AndroidConfiguration.h b/9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_AndroidConfiguration.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_AndroidMetadata.h b/9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_AndroidMetadata.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_AndroidMetadata.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_AndroidMetadata.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_Platform.h b/9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_Platform.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/SLES/OpenSLES_Platform.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/SLES/OpenSLES_Platform.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/alloca.h b/9/platforms/android-21/arch-x86_64/usr/include/alloca.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/alloca.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/alloca.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h b/9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h
index 9e9c3d6..649efd6 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/android/api-level.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/android/api-level.h
@@ -28,6 +28,6 @@
 #ifndef ANDROID_API_LEVEL_H
 #define ANDROID_API_LEVEL_H
 
-#define __ANDROID_API__ 19
+#define __ANDROID_API__ 21
 
 #endif /* ANDROID_API_LEVEL_H */
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/asset_manager.h b/9/platforms/android-21/arch-x86_64/usr/include/android/asset_manager.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/asset_manager.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/asset_manager.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/asset_manager_jni.h b/9/platforms/android-21/arch-x86_64/usr/include/android/asset_manager_jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/asset_manager_jni.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/asset_manager_jni.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/bitmap.h b/9/platforms/android-21/arch-x86_64/usr/include/android/bitmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/bitmap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/bitmap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/configuration.h b/9/platforms/android-21/arch-x86_64/usr/include/android/configuration.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/configuration.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/configuration.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/dlext.h b/9/platforms/android-21/arch-x86_64/usr/include/android/dlext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/dlext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/dlext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/input.h b/9/platforms/android-21/arch-x86_64/usr/include/android/input.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/input.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/input.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/keycodes.h b/9/platforms/android-21/arch-x86_64/usr/include/android/keycodes.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/keycodes.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/keycodes.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/log.h b/9/platforms/android-21/arch-x86_64/usr/include/android/log.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/log.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/log.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/looper.h b/9/platforms/android-21/arch-x86_64/usr/include/android/looper.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/looper.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/looper.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/native_activity.h b/9/platforms/android-21/arch-x86_64/usr/include/android/native_activity.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/native_activity.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/native_activity.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/native_window.h b/9/platforms/android-21/arch-x86_64/usr/include/android/native_window.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/native_window.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/native_window.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/native_window_jni.h b/9/platforms/android-21/arch-x86_64/usr/include/android/native_window_jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/native_window_jni.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/native_window_jni.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/obb.h b/9/platforms/android-21/arch-x86_64/usr/include/android/obb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/obb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/obb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/rect.h b/9/platforms/android-21/arch-x86_64/usr/include/android/rect.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/rect.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/rect.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/sensor.h b/9/platforms/android-21/arch-x86_64/usr/include/android/sensor.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/sensor.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/sensor.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/storage_manager.h b/9/platforms/android-21/arch-x86_64/usr/include/android/storage_manager.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/storage_manager.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/storage_manager.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/tts.h b/9/platforms/android-21/arch-x86_64/usr/include/android/tts.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/tts.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/tts.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/android/window.h b/9/platforms/android-21/arch-x86_64/usr/include/android/window.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/android/window.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/android/window.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/ar.h b/9/platforms/android-21/arch-x86_64/usr/include/ar.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/ar.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/ar.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h b/9/platforms/android-21/arch-x86_64/usr/include/arpa/inet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/arpa/inet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/arpa/inet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/arpa/nameser.h b/9/platforms/android-21/arch-x86_64/usr/include/arpa/nameser.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/arpa/nameser.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/arpa/nameser.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/arpa/nameser_compat.h b/9/platforms/android-21/arch-x86_64/usr/include/arpa/nameser_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/arpa/nameser_compat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/arpa/nameser_compat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/arpa/telnet.h b/9/platforms/android-21/arch-x86_64/usr/include/arpa/telnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/arpa/telnet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/arpa/telnet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/auxvec.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/auxvec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/auxvec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/bitsperlong.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/bitsperlong.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/bitsperlong.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/bitsperlong.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/errno-base.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/errno-base.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/errno-base.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/errno-base.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/errno.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/errno.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/errno.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/fcntl.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/fcntl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/fcntl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/int-l64.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/int-l64.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/int-l64.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/int-l64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/int-ll64.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/int-ll64.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/int-ll64.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/int-ll64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ioctls.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ioctls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ioctls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ipcbuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ipcbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ipcbuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ipcbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/kvm_para.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/kvm_para.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/kvm_para.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/mman-common.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/mman-common.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/mman-common.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/mman-common.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/mman.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/mman.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/mman.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/msgbuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/msgbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/msgbuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/msgbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/param.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/param.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/param.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/poll.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/poll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/poll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/posix_types.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/posix_types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/posix_types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/resource.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/resource.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/resource.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/sembuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/sembuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/sembuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/sembuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/setup.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/setup.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/setup.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/setup.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/shmbuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/shmbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/shmbuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/shmbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/shmparam.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/shmparam.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/shmparam.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/shmparam.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/siginfo.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/siginfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/siginfo.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/siginfo.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/signal-defs.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/signal-defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/signal-defs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/signal-defs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/signal.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/signal.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/signal.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/socket.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/socket.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/socket.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/sockios.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/sockios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/sockios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/stat.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/stat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/stat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/statfs.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/statfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/statfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/swab.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/swab.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/swab.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/termbits.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/termbits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/termbits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/termbits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/termios.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/termios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/termios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/types.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ucontext.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/ucontext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/ucontext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm-generic/unistd.h b/9/platforms/android-21/arch-x86_64/usr/include/asm-generic/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm-generic/unistd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm-generic/unistd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/a.out.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/a.out.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/a.out.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/a.out.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/auxvec.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/auxvec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/auxvec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/bitsperlong.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/bitsperlong.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/bitsperlong.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/bitsperlong.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/boot.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/boot.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/boot.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/boot.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/bootparam.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/bootparam.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/bootparam.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/bootparam.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/byteorder.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/byteorder.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/byteorder.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/byteorder.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/debugreg.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/debugreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/debugreg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/debugreg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/e820.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/e820.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/e820.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/e820.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/errno.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/errno.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/errno.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/fcntl.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/fcntl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/fcntl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/hw_breakpoint.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/hw_breakpoint.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/hw_breakpoint.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/hyperv.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/hyperv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/hyperv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/hyperv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ioctls.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ioctls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ioctls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ipcbuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ipcbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ipcbuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ipcbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ist.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ist.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ist.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ist.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/kvm.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/kvm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/kvm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/kvm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/kvm_para.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/kvm_para.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/kvm_para.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ldt.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ldt.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ldt.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ldt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/mce.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/mce.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/mce.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/mce.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/mman.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/mman.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/mman.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/msgbuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/msgbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/msgbuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/msgbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/msr-index.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/msr-index.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/msr-index.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/msr-index.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/msr.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/msr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/msr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/msr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/mtrr.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/mtrr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/mtrr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/mtrr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/param.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/param.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/param.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/perf_regs.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/perf_regs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/perf_regs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/perf_regs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/poll.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/poll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/poll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_32.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types_32.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_32.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types_32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_64.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types_64.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_64.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types_64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_x32.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types_x32.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/posix_types_x32.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/posix_types_x32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/prctl.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/prctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/prctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/processor-flags.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/processor-flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/processor-flags.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/processor-flags.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace-abi.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ptrace-abi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace-abi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ptrace-abi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ptrace.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ptrace.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/resource.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/resource.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/resource.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sembuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/sembuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/sembuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/sembuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/setup.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/setup.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/setup.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/setup.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/shmbuf.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/shmbuf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/shmbuf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/shmbuf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/sigcontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/sigcontext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext32.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/sigcontext32.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/sigcontext32.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/sigcontext32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/siginfo.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/siginfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/siginfo.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/siginfo.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/signal.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/signal.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/signal.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/socket.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/socket.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/socket.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/sockios.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/sockios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/sockios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/stat.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/stat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/stat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/statfs.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/statfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/statfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/svm.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/svm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/svm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/svm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/swab.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/swab.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/swab.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/termbits.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/termbits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/termbits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/termbits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/termios.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/termios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/termios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/types.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/ucontext.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/ucontext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/ucontext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/unistd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_32.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/unistd_32.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_32.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/unistd_32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_64.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/unistd_64.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_64.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/unistd_64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_x32.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/unistd_x32.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/unistd_x32.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/unistd_x32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/vm86.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/vm86.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/vm86.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/vm86.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/vmx.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/vmx.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/vmx.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/vmx.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/asm/vsyscall.h b/9/platforms/android-21/arch-x86_64/usr/include/asm/vsyscall.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/asm/vsyscall.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/asm/vsyscall.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/assert.h b/9/platforms/android-21/arch-x86_64/usr/include/assert.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/assert.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/assert.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/byteswap.h b/9/platforms/android-21/arch-x86_64/usr/include/byteswap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/byteswap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/byteswap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/complex.h b/9/platforms/android-21/arch-x86_64/usr/include/complex.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/complex.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/complex.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/ctype.h b/9/platforms/android-21/arch-x86_64/usr/include/ctype.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/ctype.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/ctype.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/dirent.h b/9/platforms/android-21/arch-x86_64/usr/include/dirent.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/dirent.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/dirent.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/dlfcn.h b/9/platforms/android-21/arch-x86_64/usr/include/dlfcn.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/dlfcn.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/dlfcn.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/elf.h b/9/platforms/android-21/arch-x86_64/usr/include/elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/elf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/elf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/endian.h b/9/platforms/android-21/arch-x86_64/usr/include/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/endian.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/endian.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/err.h b/9/platforms/android-21/arch-x86_64/usr/include/err.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/err.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/err.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/errno.h b/9/platforms/android-21/arch-x86_64/usr/include/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/errno.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/errno.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/fcntl.h b/9/platforms/android-21/arch-x86_64/usr/include/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/fcntl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/fcntl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/features.h b/9/platforms/android-21/arch-x86_64/usr/include/features.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/features.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/features.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/fenv.h b/9/platforms/android-21/arch-x86_64/usr/include/fenv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/fenv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/fenv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/fnmatch.h b/9/platforms/android-21/arch-x86_64/usr/include/fnmatch.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/fnmatch.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/fnmatch.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/fts.h b/9/platforms/android-21/arch-x86_64/usr/include/fts.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/fts.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/fts.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/ftw.h b/9/platforms/android-21/arch-x86_64/usr/include/ftw.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/ftw.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/ftw.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/getopt.h b/9/platforms/android-21/arch-x86_64/usr/include/getopt.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/getopt.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/getopt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/grp.h b/9/platforms/android-21/arch-x86_64/usr/include/grp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/grp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/grp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/i386/elf_machdep.h b/9/platforms/android-21/arch-x86_64/usr/include/i386/elf_machdep.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/i386/elf_machdep.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/i386/elf_machdep.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/inttypes.h b/9/platforms/android-21/arch-x86_64/usr/include/inttypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/inttypes.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/inttypes.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/jni.h b/9/platforms/android-21/arch-x86_64/usr/include/jni.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/jni.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/jni.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/lastlog.h b/9/platforms/android-21/arch-x86_64/usr/include/lastlog.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/lastlog.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/lastlog.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/libgen.h b/9/platforms/android-21/arch-x86_64/usr/include/libgen.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/libgen.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/libgen.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/limits.h b/9/platforms/android-21/arch-x86_64/usr/include/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/limits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/limits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/link.h b/9/platforms/android-21/arch-x86_64/usr/include/link.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/link.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/link.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/a.out.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/a.out.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/a.out.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/a.out.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/acct.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/acct.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/acct.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/acct.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/adb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/adb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/adb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/adb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/adfs_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/adfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/adfs_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/adfs_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/affs_hardblocks.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/affs_hardblocks.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/affs_hardblocks.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/affs_hardblocks.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/agpgart.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/agpgart.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/agpgart.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/agpgart.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/aio_abi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/aio_abi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/aio_abi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/aio_abi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/android_alarm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/android_alarm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/android_alarm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/android_alarm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/apm_bios.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/apm_bios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/apm_bios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/apm_bios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/arcfb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/arcfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/arcfb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/arcfb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ashmem.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ashmem.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ashmem.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ashmem.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atalk.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atalk.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atalk.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atalk.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm_eni.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm_eni.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm_eni.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm_eni.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm_he.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm_he.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm_he.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm_he.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm_idt77105.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm_idt77105.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm_idt77105.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm_idt77105.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm_nicstar.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm_nicstar.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm_nicstar.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm_nicstar.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm_tcp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm_tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm_tcp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm_tcp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atm_zatm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atm_zatm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atm_zatm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atm_zatm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmapi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmapi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmapi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmapi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmarp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmarp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmarp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmarp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmbr2684.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmbr2684.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmbr2684.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmbr2684.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmclip.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmclip.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmclip.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmclip.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmdev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmdev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmdev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmioc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmioc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmioc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmioc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmlec.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmlec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmlec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmlec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmmpc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmmpc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmmpc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmmpc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmppp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmppp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmppp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmsap.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmsap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmsap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmsap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/atmsvc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/atmsvc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/atmsvc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/atmsvc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/audit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/audit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/audit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/audit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/auto_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/auto_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/auto_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/auto_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/auto_fs4.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/auto_fs4.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/auto_fs4.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/auto_fs4.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/auxvec.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/auxvec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/auxvec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/auxvec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ax25.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ax25.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ax25.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ax25.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/b1lli.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/b1lli.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/b1lli.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/b1lli.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/baycom.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/baycom.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/baycom.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/baycom.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/bcache.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/bcache.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/bcache.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/bcache.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/bcm933xx_hcs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/bcm933xx_hcs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/bcm933xx_hcs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/bcm933xx_hcs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/bfs_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/bfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/bfs_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/bfs_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/binder.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/binder.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/binder.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/binder.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/binfmts.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/binfmts.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/binfmts.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/binfmts.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/blkpg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/blkpg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/blkpg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/blkpg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/blktrace_api.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/blktrace_api.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/blktrace_api.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/blktrace_api.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/bpqether.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/bpqether.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/bpqether.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/bpqether.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/bsg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/bsg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/bsg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/bsg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/btrfs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/btrfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/btrfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/btrfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/byteorder/big_endian.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/byteorder/big_endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/byteorder/big_endian.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/byteorder/big_endian.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/byteorder/little_endian.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/byteorder/little_endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/byteorder/little_endian.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/byteorder/little_endian.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/caif/caif_socket.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/caif/caif_socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/caif/caif_socket.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/caif/caif_socket.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/caif/if_caif.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/caif/if_caif.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/caif/if_caif.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/caif/if_caif.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/can.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/can.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/can.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/can.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/can/bcm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/can/bcm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/can/bcm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/can/bcm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/can/error.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/can/error.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/can/error.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/can/error.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/can/gw.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/can/gw.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/can/gw.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/can/gw.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/can/netlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/can/netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/can/netlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/can/netlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/can/raw.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/can/raw.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/can/raw.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/can/raw.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/capability.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/capability.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/capability.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/capability.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/capi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/capi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/capi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/capi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cciss_defs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cciss_defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cciss_defs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cciss_defs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cciss_ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cciss_ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cciss_ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cciss_ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cdrom.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cdrom.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cdrom.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cdrom.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cgroupstats.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cgroupstats.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cgroupstats.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cgroupstats.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/chio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/chio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/chio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/chio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cifs/cifs_mount.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cifs/cifs_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cifs/cifs_mount.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cifs/cifs_mount.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cm4000_cs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cm4000_cs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cm4000_cs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cm4000_cs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cn_proc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cn_proc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cn_proc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cn_proc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/coda.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/coda.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/coda.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/coda.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/coda_psdev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/coda_psdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/coda_psdev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/coda_psdev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/coff.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/coff.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/coff.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/coff.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/compiler.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/compiler.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/compiler.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/compiler.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/connector.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/connector.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/connector.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/connector.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/const.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/const.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/const.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/const.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cramfs_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cramfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cramfs_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cramfs_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cuda.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cuda.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cuda.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cuda.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cyclades.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cyclades.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cyclades.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cyclades.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/cycx_cfm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/cycx_cfm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/cycx_cfm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/cycx_cfm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dcbnl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dcbnl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dcbnl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dcbnl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dccp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dccp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dccp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dccp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dlm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dlm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dlm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dlm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dlm_device.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dlm_device.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dlm_device.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dlm_device.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dlm_netlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dlm_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dlm_netlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dlm_netlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dlm_plock.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dlm_plock.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dlm_plock.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dlm_plock.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dlmconstants.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dlmconstants.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dlmconstants.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dlmconstants.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dm-ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dm-ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dm-ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dm-ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dm-log-userspace.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dm-log-userspace.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dm-log-userspace.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dm-log-userspace.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dn.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dn.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dn.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dn.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dqblk_xfs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dqblk_xfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dqblk_xfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dqblk_xfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/audio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/audio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/audio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/audio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/ca.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/ca.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/ca.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/ca.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/dmx.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/dmx.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/dmx.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/dmx.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/frontend.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/frontend.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/frontend.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/frontend.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/net.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/net.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/net.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/net.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/osd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/osd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/osd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/osd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/version.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/version.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/version.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/version.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/video.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/video.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/dvb/video.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/dvb/video.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/edd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/edd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/edd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/edd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/efs_fs_sb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/efs_fs_sb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/efs_fs_sb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/efs_fs_sb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/elf-em.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/elf-em.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/elf-em.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/elf-em.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/elf-fdpic.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/elf-fdpic.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/elf-fdpic.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/elf-fdpic.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/elf.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/elf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/elf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/elfcore.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/elfcore.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/elfcore.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/elfcore.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/errno.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/errno.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/errno.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/errqueue.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/errqueue.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/errqueue.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/errqueue.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ethtool.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ethtool.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ethtool.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ethtool.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/eventpoll.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/eventpoll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/eventpoll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/eventpoll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fadvise.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fadvise.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fadvise.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fadvise.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/falloc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/falloc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/falloc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/falloc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fanotify.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fanotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fanotify.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fanotify.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fcntl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fcntl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fcntl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fcntl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fdreg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fdreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fdreg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fdreg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fib_rules.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fib_rules.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fib_rules.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fib_rules.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fiemap.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fiemap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fiemap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fiemap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/filter.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/filter.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/filter.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/filter.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/firewire-cdev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/firewire-cdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/firewire-cdev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/firewire-cdev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/firewire-constants.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/firewire-constants.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/firewire-constants.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/firewire-constants.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/flat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/flat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/flat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/flat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fsl_hypervisor.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fsl_hypervisor.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fsl_hypervisor.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fsl_hypervisor.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/fuse.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/fuse.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/fuse.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/fuse.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/futex.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/futex.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/futex.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/futex.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/gameport.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/gameport.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/gameport.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/gameport.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/gen_stats.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/gen_stats.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/gen_stats.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/gen_stats.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/genetlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/genetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/genetlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/genetlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/genwqe/genwqe_card.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/genwqe/genwqe_card.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/genwqe/genwqe_card.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/genwqe/genwqe_card.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/gfs2_ondisk.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/gfs2_ondisk.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/gfs2_ondisk.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/gfs2_ondisk.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/gigaset_dev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/gigaset_dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/gigaset_dev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/gigaset_dev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hash_info.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hash_info.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hash_info.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hash_info.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hdlc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hdlc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hdlc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hdlc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hdlc/ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hdlc/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hdlc/ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hdlc/ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hdlcdrv.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hdlcdrv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hdlcdrv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hdlcdrv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hdreg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hdreg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hdreg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hdreg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hid.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hid.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hid.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hid.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hiddev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hiddev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hiddev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hiddev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hidraw.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hidraw.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hidraw.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hidraw.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hpet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hpet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hpet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hpet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hsi/hsi_char.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hsi/hsi_char.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hsi/hsi_char.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hsi/hsi_char.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hsr_netlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hsr_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hsr_netlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hsr_netlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hw_breakpoint.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hw_breakpoint.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hw_breakpoint.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hw_breakpoint.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/hysdn_if.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/hysdn_if.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/hysdn_if.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/hysdn_if.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/i2c-dev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/i2c-dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/i2c-dev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/i2c-dev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/i2c.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/i2c.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/i2c.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/i2c.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/i2o-dev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/i2o-dev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/i2o-dev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/i2o-dev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/i8k.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/i8k.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/i8k.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/i8k.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/icmp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/icmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/icmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/icmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/icmpv6.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/icmpv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/icmpv6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/icmpv6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_addr.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_addr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_addr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_addr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_addrlabel.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_addrlabel.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_addrlabel.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_addrlabel.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_alg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_alg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_alg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_alg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_arcnet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_arcnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_arcnet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_arcnet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_arp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_arp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_arp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_bonding.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_bonding.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_bonding.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_bonding.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_bridge.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_bridge.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_bridge.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_bridge.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_cablemodem.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_cablemodem.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_cablemodem.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_cablemodem.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_eql.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_eql.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_eql.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_eql.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_ether.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_ether.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_ether.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_fc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_fc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_fc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_fc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_fddi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_fddi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_fddi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_fddi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_frad.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_frad.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_frad.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_frad.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_hippi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_hippi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_hippi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_hippi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_infiniband.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_infiniband.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_infiniband.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_infiniband.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_link.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_link.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_link.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_link.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_ltalk.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_ltalk.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_ltalk.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_ltalk.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_packet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_packet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_packet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_phonet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_phonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_phonet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_phonet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_plip.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_plip.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_plip.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_plip.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_ppp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_ppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_ppp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_ppp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppol2tp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppol2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppol2tp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppol2tp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppolac.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppolac.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppolac.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppolac.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppopns.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppopns.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppopns.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppopns.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppox.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppox.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_pppox.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_pppox.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_slip.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_slip.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_slip.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_slip.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_team.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_team.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_team.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_team.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_tun.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_tun.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_tun.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_tun.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_tunnel.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_tunnel.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_tunnel.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_tunnel.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_vlan.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_vlan.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_vlan.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_vlan.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/if_x25.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/if_x25.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/if_x25.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/if_x25.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/igmp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/igmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/igmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/igmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/in.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/in.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/in.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/in.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/in6.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/in6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/in6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/in6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/in_route.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/in_route.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/in_route.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/in_route.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/inet_diag.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/inet_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/inet_diag.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/inet_diag.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/inotify.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/inotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/inotify.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/inotify.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/input.h
similarity index 97%
copy from 9/platforms/android-19/arch-arm64/usr/include/linux/input.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/linux/input.h
index df3200c..b9d5b2a 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/linux/input.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/linux/input.h
@@ -97,629 +97,644 @@
 #define INPUT_PROP_BUTTONPAD 0x02
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define INPUT_PROP_SEMI_MT 0x03
+#define INPUT_PROP_TOPBUTTONPAD 0x04
 #define INPUT_PROP_MAX 0x1f
 #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)
-#define EV_SYN 0x00
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_SYN 0x00
 #define EV_KEY 0x01
 #define EV_REL 0x02
 #define EV_ABS 0x03
-#define EV_MSC 0x04
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MSC 0x04
 #define EV_SW 0x05
 #define EV_LED 0x11
 #define EV_SND 0x12
-#define EV_REP 0x14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_REP 0x14
 #define EV_FF 0x15
 #define EV_PWR 0x16
 #define EV_FF_STATUS 0x17
-#define EV_MAX 0x1f
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define EV_MAX 0x1f
 #define EV_CNT (EV_MAX+1)
 #define SYN_REPORT 0
 #define SYN_CONFIG 1
-#define SYN_MT_REPORT 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SYN_MT_REPORT 2
 #define SYN_DROPPED 3
 #define SYN_MAX 0xf
 #define SYN_CNT (SYN_MAX+1)
-#define KEY_RESERVED 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RESERVED 0
 #define KEY_ESC 1
 #define KEY_1 2
 #define KEY_2 3
-#define KEY_3 4
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_3 4
 #define KEY_4 5
 #define KEY_5 6
 #define KEY_6 7
-#define KEY_7 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_7 8
 #define KEY_8 9
 #define KEY_9 10
 #define KEY_0 11
-#define KEY_MINUS 12
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MINUS 12
 #define KEY_EQUAL 13
 #define KEY_BACKSPACE 14
 #define KEY_TAB 15
-#define KEY_Q 16
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Q 16
 #define KEY_W 17
 #define KEY_E 18
 #define KEY_R 19
-#define KEY_T 20
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_T 20
 #define KEY_Y 21
 #define KEY_U 22
 #define KEY_I 23
-#define KEY_O 24
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_O 24
 #define KEY_P 25
 #define KEY_LEFTBRACE 26
 #define KEY_RIGHTBRACE 27
-#define KEY_ENTER 28
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ENTER 28
 #define KEY_LEFTCTRL 29
 #define KEY_A 30
 #define KEY_S 31
-#define KEY_D 32
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_D 32
 #define KEY_F 33
 #define KEY_G 34
 #define KEY_H 35
-#define KEY_J 36
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_J 36
 #define KEY_K 37
 #define KEY_L 38
 #define KEY_SEMICOLON 39
-#define KEY_APOSTROPHE 40
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_APOSTROPHE 40
 #define KEY_GRAVE 41
 #define KEY_LEFTSHIFT 42
 #define KEY_BACKSLASH 43
-#define KEY_Z 44
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_Z 44
 #define KEY_X 45
 #define KEY_C 46
 #define KEY_V 47
-#define KEY_B 48
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_B 48
 #define KEY_N 49
 #define KEY_M 50
 #define KEY_COMMA 51
-#define KEY_DOT 52
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DOT 52
 #define KEY_SLASH 53
 #define KEY_RIGHTSHIFT 54
 #define KEY_KPASTERISK 55
-#define KEY_LEFTALT 56
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFTALT 56
 #define KEY_SPACE 57
 #define KEY_CAPSLOCK 58
 #define KEY_F1 59
-#define KEY_F2 60
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F2 60
 #define KEY_F3 61
 #define KEY_F4 62
 #define KEY_F5 63
-#define KEY_F6 64
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F6 64
 #define KEY_F7 65
 #define KEY_F8 66
 #define KEY_F9 67
-#define KEY_F10 68
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F10 68
 #define KEY_NUMLOCK 69
 #define KEY_SCROLLLOCK 70
 #define KEY_KP7 71
-#define KEY_KP8 72
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP8 72
 #define KEY_KP9 73
 #define KEY_KPMINUS 74
 #define KEY_KP4 75
-#define KEY_KP5 76
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP5 76
 #define KEY_KP6 77
 #define KEY_KPPLUS 78
 #define KEY_KP1 79
-#define KEY_KP2 80
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KP2 80
 #define KEY_KP3 81
 #define KEY_KP0 82
 #define KEY_KPDOT 83
-#define KEY_ZENKAKUHANKAKU 85
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_ZENKAKUHANKAKU 85
 #define KEY_102ND 86
 #define KEY_F11 87
 #define KEY_F12 88
-#define KEY_RO 89
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RO 89
 #define KEY_KATAKANA 90
 #define KEY_HIRAGANA 91
 #define KEY_HENKAN 92
-#define KEY_KATAKANAHIRAGANA 93
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KATAKANAHIRAGANA 93
 #define KEY_MUHENKAN 94
 #define KEY_KPJPCOMMA 95
 #define KEY_KPENTER 96
-#define KEY_RIGHTCTRL 97
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RIGHTCTRL 97
 #define KEY_KPSLASH 98
 #define KEY_SYSRQ 99
 #define KEY_RIGHTALT 100
-#define KEY_LINEFEED 101
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LINEFEED 101
 #define KEY_HOME 102
 #define KEY_UP 103
 #define KEY_PAGEUP 104
-#define KEY_LEFT 105
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_LEFT 105
 #define KEY_RIGHT 106
 #define KEY_END 107
 #define KEY_DOWN 108
-#define KEY_PAGEDOWN 109
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PAGEDOWN 109
 #define KEY_INSERT 110
 #define KEY_DELETE 111
 #define KEY_MACRO 112
-#define KEY_MUTE 113
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MUTE 113
 #define KEY_VOLUMEDOWN 114
 #define KEY_VOLUMEUP 115
 #define KEY_POWER 116
-#define KEY_KPEQUAL 117
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPEQUAL 117
 #define KEY_KPPLUSMINUS 118
 #define KEY_PAUSE 119
 #define KEY_SCALE 120
-#define KEY_KPCOMMA 121
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPCOMMA 121
 #define KEY_HANGEUL 122
 #define KEY_HANGUEL KEY_HANGEUL
 #define KEY_HANJA 123
-#define KEY_YEN 124
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_YEN 124
 #define KEY_LEFTMETA 125
 #define KEY_RIGHTMETA 126
 #define KEY_COMPOSE 127
-#define KEY_STOP 128
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_STOP 128
 #define KEY_AGAIN 129
 #define KEY_PROPS 130
 #define KEY_UNDO 131
-#define KEY_FRONT 132
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FRONT 132
 #define KEY_COPY 133
 #define KEY_OPEN 134
 #define KEY_PASTE 135
-#define KEY_FIND 136
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FIND 136
 #define KEY_CUT 137
 #define KEY_HELP 138
 #define KEY_MENU 139
-#define KEY_CALC 140
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CALC 140
 #define KEY_SETUP 141
 #define KEY_SLEEP 142
 #define KEY_WAKEUP 143
-#define KEY_FILE 144
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FILE 144
 #define KEY_SENDFILE 145
 #define KEY_DELETEFILE 146
 #define KEY_XFER 147
-#define KEY_PROG1 148
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PROG1 148
 #define KEY_PROG2 149
 #define KEY_WWW 150
 #define KEY_MSDOS 151
-#define KEY_COFFEE 152
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_COFFEE 152
 #define KEY_SCREENLOCK KEY_COFFEE
 #define KEY_DIRECTION 153
 #define KEY_CYCLEWINDOWS 154
-#define KEY_MAIL 155
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MAIL 155
 #define KEY_BOOKMARKS 156
 #define KEY_COMPUTER 157
 #define KEY_BACK 158
-#define KEY_FORWARD 159
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FORWARD 159
 #define KEY_CLOSECD 160
 #define KEY_EJECTCD 161
 #define KEY_EJECTCLOSECD 162
-#define KEY_NEXTSONG 163
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_NEXTSONG 163
 #define KEY_PLAYPAUSE 164
 #define KEY_PREVIOUSSONG 165
 #define KEY_STOPCD 166
-#define KEY_RECORD 167
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_RECORD 167
 #define KEY_REWIND 168
 #define KEY_PHONE 169
 #define KEY_ISO 170
-#define KEY_CONFIG 171
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CONFIG 171
 #define KEY_HOMEPAGE 172
 #define KEY_REFRESH 173
 #define KEY_EXIT 174
-#define KEY_MOVE 175
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_MOVE 175
 #define KEY_EDIT 176
 #define KEY_SCROLLUP 177
 #define KEY_SCROLLDOWN 178
-#define KEY_KPLEFTPAREN 179
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KPLEFTPAREN 179
 #define KEY_KPRIGHTPAREN 180
 #define KEY_NEW 181
 #define KEY_REDO 182
-#define KEY_F13 183
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F13 183
 #define KEY_F14 184
 #define KEY_F15 185
 #define KEY_F16 186
-#define KEY_F17 187
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F17 187
 #define KEY_F18 188
 #define KEY_F19 189
 #define KEY_F20 190
-#define KEY_F21 191
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_F21 191
 #define KEY_F22 192
 #define KEY_F23 193
 #define KEY_F24 194
-#define KEY_PLAYCD 200
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_PLAYCD 200
 #define KEY_PAUSECD 201
 #define KEY_PROG3 202
 #define KEY_PROG4 203
-#define KEY_DASHBOARD 204
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_DASHBOARD 204
 #define KEY_SUSPEND 205
 #define KEY_CLOSE 206
 #define KEY_PLAY 207
-#define KEY_FASTFORWARD 208
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_FASTFORWARD 208
 #define KEY_BASSBOOST 209
 #define KEY_PRINT 210
 #define KEY_HP 211
-#define KEY_CAMERA 212
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CAMERA 212
 #define KEY_SOUND 213
 #define KEY_QUESTION 214
 #define KEY_EMAIL 215
-#define KEY_CHAT 216
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_CHAT 216
 #define KEY_SEARCH 217
 #define KEY_CONNECT 218
 #define KEY_FINANCE 219
-#define KEY_SPORT 220
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SPORT 220
 #define KEY_SHOP 221
 #define KEY_ALTERASE 222
 #define KEY_CANCEL 223
-#define KEY_BRIGHTNESSDOWN 224
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESSDOWN 224
 #define KEY_BRIGHTNESSUP 225
 #define KEY_MEDIA 226
 #define KEY_SWITCHVIDEOMODE 227
-#define KEY_KBDILLUMTOGGLE 228
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_KBDILLUMTOGGLE 228
 #define KEY_KBDILLUMDOWN 229
 #define KEY_KBDILLUMUP 230
 #define KEY_SEND 231
-#define KEY_REPLY 232
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_REPLY 232
 #define KEY_FORWARDMAIL 233
 #define KEY_SAVE 234
 #define KEY_DOCUMENTS 235
-#define KEY_BATTERY 236
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BATTERY 236
 #define KEY_BLUETOOTH 237
 #define KEY_WLAN 238
 #define KEY_UWB 239
-#define KEY_UNKNOWN 240
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_UNKNOWN 240
 #define KEY_VIDEO_NEXT 241
 #define KEY_VIDEO_PREV 242
 #define KEY_BRIGHTNESS_CYCLE 243
-#define KEY_BRIGHTNESS_ZERO 244
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_AUTO 244
+#define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO
 #define KEY_DISPLAY_OFF 245
 #define KEY_WWAN 246
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WIMAX KEY_WWAN
 #define KEY_RFKILL 247
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MICMUTE 248
 #define BTN_MISC 0x100
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_0 0x100
 #define BTN_1 0x101
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_2 0x102
 #define BTN_3 0x103
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_4 0x104
 #define BTN_5 0x105
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_6 0x106
 #define BTN_7 0x107
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_8 0x108
 #define BTN_9 0x109
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MOUSE 0x110
 #define BTN_LEFT 0x110
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_RIGHT 0x111
 #define BTN_MIDDLE 0x112
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SIDE 0x113
 #define BTN_EXTRA 0x114
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_FORWARD 0x115
 #define BTN_BACK 0x116
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TASK 0x117
 #define BTN_JOYSTICK 0x120
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER 0x120
 #define BTN_THUMB 0x121
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMB2 0x122
 #define BTN_TOP 0x123
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOP2 0x124
 #define BTN_PINKIE 0x125
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE 0x126
 #define BTN_BASE2 0x127
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE3 0x128
 #define BTN_BASE4 0x129
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_BASE5 0x12a
 #define BTN_BASE6 0x12b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DEAD 0x12f
 #define BTN_GAMEPAD 0x130
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SOUTH 0x130
 #define BTN_A BTN_SOUTH
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_EAST 0x131
 #define BTN_B BTN_EAST
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_C 0x132
 #define BTN_NORTH 0x133
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_X BTN_NORTH
 #define BTN_WEST 0x134
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_Y BTN_WEST
 #define BTN_Z 0x135
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL 0x136
 #define BTN_TR 0x137
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TL2 0x138
 #define BTN_TR2 0x139
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_SELECT 0x13a
 #define BTN_START 0x13b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_MODE 0x13c
 #define BTN_THUMBL 0x13d
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_THUMBR 0x13e
 #define BTN_DIGI 0x140
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_PEN 0x140
 #define BTN_TOOL_RUBBER 0x141
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_BRUSH 0x142
 #define BTN_TOOL_PENCIL 0x143
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_AIRBRUSH 0x144
 #define BTN_TOOL_FINGER 0x145
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_MOUSE 0x146
 #define BTN_TOOL_LENS 0x147
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUINTTAP 0x148
 #define BTN_TOUCH 0x14a
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_STYLUS 0x14b
 #define BTN_STYLUS2 0x14c
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_DOUBLETAP 0x14d
 #define BTN_TOOL_TRIPLETAP 0x14e
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TOOL_QUADTAP 0x14f
 #define BTN_WHEEL 0x150
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_GEAR_DOWN 0x150
 #define BTN_GEAR_UP 0x151
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_OK 0x160
 #define KEY_SELECT 0x161
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GOTO 0x162
 #define KEY_CLEAR 0x163
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_POWER2 0x164
 #define KEY_OPTION 0x165
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_INFO 0x166
 #define KEY_TIME 0x167
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VENDOR 0x168
 #define KEY_ARCHIVE 0x169
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PROGRAM 0x16a
 #define KEY_CHANNEL 0x16b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FAVORITES 0x16c
 #define KEY_EPG 0x16d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PVR 0x16e
 #define KEY_MHP 0x16f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_LANGUAGE 0x170
 #define KEY_TITLE 0x171
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SUBTITLE 0x172
 #define KEY_ANGLE 0x173
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOM 0x174
 #define KEY_MODE 0x175
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_KEYBOARD 0x176
 #define KEY_SCREEN 0x177
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PC 0x178
 #define KEY_TV 0x179
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TV2 0x17a
 #define KEY_VCR 0x17b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VCR2 0x17c
 #define KEY_SAT 0x17d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SAT2 0x17e
 #define KEY_CD 0x17f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TAPE 0x180
 #define KEY_RADIO 0x181
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TUNER 0x182
 #define KEY_PLAYER 0x183
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEXT 0x184
 #define KEY_DVD 0x185
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUX 0x186
 #define KEY_MP3 0x187
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AUDIO 0x188
 #define KEY_VIDEO 0x189
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DIRECTORY 0x18a
 #define KEY_LIST 0x18b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEMO 0x18c
 #define KEY_CALENDAR 0x18d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RED 0x18e
 #define KEY_GREEN 0x18f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_YELLOW 0x190
 #define KEY_BLUE 0x191
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CHANNELUP 0x192
 #define KEY_CHANNELDOWN 0x193
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FIRST 0x194
 #define KEY_LAST 0x195
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_AB 0x196
 #define KEY_NEXT 0x197
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_RESTART 0x198
 #define KEY_SLOW 0x199
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_SHUFFLE 0x19a
 #define KEY_BREAK 0x19b
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_PREVIOUS 0x19c
 #define KEY_DIGITS 0x19d
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TEEN 0x19e
 #define KEY_TWEN 0x19f
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VIDEOPHONE 0x1a0
 #define KEY_GAMES 0x1a1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMIN 0x1a2
 #define KEY_ZOOMOUT 0x1a3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ZOOMRESET 0x1a4
 #define KEY_WORDPROCESSOR 0x1a5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EDITOR 0x1a6
 #define KEY_SPREADSHEET 0x1a7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_GRAPHICSEDITOR 0x1a8
 #define KEY_PRESENTATION 0x1a9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DATABASE 0x1aa
 #define KEY_NEWS 0x1ab
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_VOICEMAIL 0x1ac
 #define KEY_ADDRESSBOOK 0x1ad
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MESSENGER 0x1ae
 #define KEY_DISPLAYTOGGLE 0x1af
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE
 #define KEY_SPELLCHECK 0x1b0
 #define KEY_LOGOFF 0x1b1
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DOLLAR 0x1b2
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_EURO 0x1b3
 #define KEY_FRAMEBACK 0x1b4
 #define KEY_FRAMEFORWARD 0x1b5
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CONTEXT_MENU 0x1b6
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_MEDIA_REPEAT 0x1b7
 #define KEY_10CHANNELSUP 0x1b8
 #define KEY_10CHANNELSDOWN 0x1b9
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_IMAGES 0x1ba
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_EOL 0x1c0
 #define KEY_DEL_EOS 0x1c1
 #define KEY_INS_LINE 0x1c2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_DEL_LINE 0x1c3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN 0x1d0
 #define KEY_FN_ESC 0x1d1
 #define KEY_FN_F1 0x1d2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F2 0x1d3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F3 0x1d4
 #define KEY_FN_F4 0x1d5
 #define KEY_FN_F5 0x1d6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F6 0x1d7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F7 0x1d8
 #define KEY_FN_F8 0x1d9
 #define KEY_FN_F9 0x1da
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F10 0x1db
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_F11 0x1dc
 #define KEY_FN_F12 0x1dd
 #define KEY_FN_1 0x1de
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_2 0x1df
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_D 0x1e0
 #define KEY_FN_E 0x1e1
 #define KEY_FN_F 0x1e2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_S 0x1e3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_FN_B 0x1e4
 #define KEY_BRL_DOT1 0x1f1
 #define KEY_BRL_DOT2 0x1f2
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT3 0x1f3
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT4 0x1f4
 #define KEY_BRL_DOT5 0x1f5
 #define KEY_BRL_DOT6 0x1f6
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT7 0x1f7
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_BRL_DOT8 0x1f8
 #define KEY_BRL_DOT9 0x1f9
 #define KEY_BRL_DOT10 0x1fa
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_0 0x200
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_1 0x201
 #define KEY_NUMERIC_2 0x202
 #define KEY_NUMERIC_3 0x203
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_4 0x204
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_5 0x205
 #define KEY_NUMERIC_6 0x206
 #define KEY_NUMERIC_7 0x207
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_8 0x208
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_NUMERIC_9 0x209
 #define KEY_NUMERIC_STAR 0x20a
 #define KEY_NUMERIC_POUND 0x20b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_FOCUS 0x210
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_WPS_BUTTON 0x211
 #define KEY_TOUCHPAD_TOGGLE 0x212
 #define KEY_TOUCHPAD_ON 0x213
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_TOUCHPAD_OFF 0x214
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_ZOOMIN 0x215
 #define KEY_CAMERA_ZOOMOUT 0x216
 #define KEY_CAMERA_UP 0x217
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_DOWN 0x218
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_CAMERA_LEFT 0x219
 #define KEY_CAMERA_RIGHT 0x21a
 #define KEY_ATTENDANT_ON 0x21b
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_OFF 0x21c
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define KEY_ATTENDANT_TOGGLE 0x21d
 #define KEY_LIGHTS_TOGGLE 0x21e
 #define BTN_DPAD_UP 0x220
-/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_DOWN 0x221
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_DPAD_LEFT 0x222
 #define BTN_DPAD_RIGHT 0x223
 #define KEY_ALS_TOGGLE 0x230
+#define KEY_BUTTONCONFIG 0x240
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_TASKMANAGER 0x241
+#define KEY_JOURNAL 0x242
+#define KEY_CONTROLPANEL 0x243
+#define KEY_APPSELECT 0x244
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define KEY_SCREENSAVER 0x245
+#define KEY_VOICECOMMAND 0x246
+#define KEY_BRIGHTNESS_MIN 0x250
+#define KEY_BRIGHTNESS_MAX 0x251
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define BTN_TRIGGER_HAPPY 0x2c0
 #define BTN_TRIGGER_HAPPY1 0x2c0
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ion.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ion.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ion.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ion.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ioprio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ioprio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ioprio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ioprio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ip.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ip.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ip.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ip6_tunnel.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ip6_tunnel.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ip6_tunnel.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ip6_tunnel.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ip_vs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ip_vs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ip_vs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ip_vs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipmi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipmi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipmi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipmi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipmi_msgdefs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipmi_msgdefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipmi_msgdefs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipmi_msgdefs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipsec.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipsec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipsec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipsec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipv6.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipv6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipv6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipv6_route.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipv6_route.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipv6_route.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipv6_route.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ipx.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ipx.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ipx.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ipx.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/irda.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/irda.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/irda.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/irda.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/irqnr.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/irqnr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/irqnr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/irqnr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/isdn.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/isdn.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/isdn.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/isdn.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/isdn/capicmd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/isdn/capicmd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/isdn/capicmd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/isdn/capicmd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/isdn_divertif.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/isdn_divertif.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/isdn_divertif.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/isdn_divertif.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/isdn_ppp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/isdn_ppp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/isdn_ppp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/isdn_ppp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/isdnif.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/isdnif.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/isdnif.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/isdnif.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/iso_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/iso_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/iso_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/iso_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ivtv.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ivtv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ivtv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ivtv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ivtvfb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ivtvfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ivtvfb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ivtvfb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ixjuser.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ixjuser.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ixjuser.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ixjuser.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/jffs2.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/jffs2.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/jffs2.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/jffs2.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/joystick.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/joystick.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/joystick.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/joystick.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kdev_t.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kdev_t.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kdev_t.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kdev_t.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kernel-page-flags.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kernel-page-flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kernel-page-flags.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kernel-page-flags.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kernel.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kernel.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kernel.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kernel.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kernelcapi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kernelcapi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kernelcapi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kernelcapi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kexec.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kexec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kexec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kexec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/keyboard.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/keyboard.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/keyboard.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/keyboard.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/keychord.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/keychord.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/keychord.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/keychord.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/keyctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/keyctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/keyctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/keyctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kvm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kvm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kvm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kvm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/kvm_para.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/kvm_para.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/kvm_para.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/kvm_para.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/l2tp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/l2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/l2tp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/l2tp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/libc-compat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/libc-compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/libc-compat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/libc-compat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/limits.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/limits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/limits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/llc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/llc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/llc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/llc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/loop.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/loop.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/loop.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/loop.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/lp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/lp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/lp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/lp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/magic.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/magic.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/magic.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/magic.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/major.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/major.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/major.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/major.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/map_to_7segment.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/map_to_7segment.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/map_to_7segment.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/map_to_7segment.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/matroxfb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/matroxfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/matroxfb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/matroxfb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mdio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mdio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mdio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mdio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/media.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/media.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/media.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/media.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mei.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mei.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mei.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mei.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mempolicy.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mempolicy.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mempolicy.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mempolicy.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/meye.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/meye.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/meye.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/meye.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mic_common.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mic_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mic_common.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mic_common.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mic_ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mic_ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mic_ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mic_ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mii.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mii.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mii.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mii.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/minix_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/minix_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/minix_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/minix_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mman.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mman.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mman.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mmc/ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mmc/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mmc/ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mmc/ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mmtimer.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mmtimer.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mmtimer.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mmtimer.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/module.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/module.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/module.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/module.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mqueue.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mqueue.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mqueue.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mqueue.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mroute.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mroute.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mroute.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mroute.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mroute6.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mroute6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mroute6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mroute6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/msdos_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/msdos_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/msdos_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/msdos_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/msg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/msg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/msg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/msg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/mtio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/mtio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/mtio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/mtio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/n_r3964.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/n_r3964.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/n_r3964.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/n_r3964.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nbd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nbd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nbd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nbd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ncp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ncp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ncp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ncp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ncp_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ncp_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ncp_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ncp_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ncp_mount.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ncp_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ncp_mount.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ncp_mount.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ncp_no.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ncp_no.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ncp_no.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ncp_no.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/neighbour.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/neighbour.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/neighbour.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/neighbour.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/net.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/net.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/net.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/net.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/net_dropmon.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/net_dropmon.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/net_dropmon.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/net_dropmon.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/net_tstamp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/net_tstamp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/net_tstamp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/net_tstamp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netconf.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netconf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netconf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netdevice.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netdevice.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netdevice.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netdevice.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_bitmap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_hash.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_hash.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_hash.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_hash.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_list.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_list.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_list.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/ipset/ip_set_list.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_common.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_common.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_common.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_ftp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_ftp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_ftp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_ftp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_sctp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_sctp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_sctp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tcp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tcp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tcp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_conntrack_tuple_common.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_nat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_nat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_nat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_tables.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_tables.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_tables.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_tables_compat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_tables_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nf_tables_compat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nf_tables_compat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_acct.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_acct.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_acct.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_acct.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_compat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_compat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_compat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_conntrack.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_conntrack.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_conntrack.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cthelper.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cthelper.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cthelper.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cthelper.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cttimeout.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_cttimeout.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_log.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_log.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_log.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_log.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_queue.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_queue.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/nfnetlink_queue.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/nfnetlink_queue.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/x_tables.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/x_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/x_tables.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/x_tables.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_AUDIT.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_AUDIT.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_AUDIT.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_AUDIT.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CHECKSUM.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CHECKSUM.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CHECKSUM.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CHECKSUM.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CLASSIFY.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CLASSIFY.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CLASSIFY.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CLASSIFY.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CONNMARK.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CONNMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CONNMARK.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CONNMARK.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CONNSECMARK.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CONNSECMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CONNSECMARK.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CONNSECMARK.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CT.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CT.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_CT.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_CT.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_DSCP.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_DSCP.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_DSCP.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_DSCP.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_HMARK.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_HMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_HMARK.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_HMARK.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_IDLETIMER.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_IDLETIMER.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_IDLETIMER.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_IDLETIMER.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_LED.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_LED.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_LED.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_LED.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_LOG.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_LOG.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_LOG.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_MARK.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_MARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_MARK.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_MARK.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_NFLOG.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_NFLOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_NFLOG.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_NFLOG.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_NFQUEUE.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_NFQUEUE.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_NFQUEUE.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_NFQUEUE.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_RATEEST.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_RATEEST.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_RATEEST.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_RATEEST.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_SECMARK.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_SECMARK.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_SECMARK.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_SECMARK.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_SYNPROXY.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_SYNPROXY.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_SYNPROXY.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_SYNPROXY.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TCPMSS.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TCPMSS.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TCPMSS.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TCPMSS.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TCPOPTSTRIP.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TEE.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TEE.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TEE.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TEE.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TPROXY.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TPROXY.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_TPROXY.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_TPROXY.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_addrtype.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_addrtype.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_addrtype.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_addrtype.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_bpf.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_bpf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_bpf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_bpf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_cgroup.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_cgroup.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_cgroup.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_cgroup.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_cluster.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_cluster.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_cluster.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_cluster.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_comment.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_comment.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_comment.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_comment.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connbytes.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connbytes.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connbytes.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connbytes.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connlabel.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connlabel.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connlabel.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connlabel.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connlimit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connlimit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connlimit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connlimit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connmark.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connmark.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_connmark.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_connmark.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_conntrack.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_conntrack.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_conntrack.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_conntrack.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_cpu.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_cpu.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_cpu.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_cpu.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_dccp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_dccp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_dccp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_dccp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_devgroup.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_devgroup.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_devgroup.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_devgroup.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_dscp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_dscp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_dscp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_dscp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_ecn.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_ecn.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_ecn.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_ecn.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_esp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_esp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_esp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_esp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_hashlimit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_hashlimit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_hashlimit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_hashlimit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_helper.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_helper.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_helper.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_helper.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_ipcomp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_ipcomp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_ipcomp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_ipcomp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_iprange.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_iprange.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_iprange.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_iprange.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_ipvs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_ipvs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_ipvs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_ipvs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_l2tp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_l2tp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_l2tp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_l2tp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_length.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_length.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_length.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_length.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_limit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_limit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_limit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_limit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_mac.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_mac.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_mac.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_mac.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_mark.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_mark.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_mark.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_mark.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_multiport.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_multiport.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_multiport.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_multiport.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_nfacct.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_nfacct.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_nfacct.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_nfacct.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_osf.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_osf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_osf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_osf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_owner.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_owner.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_owner.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_owner.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_physdev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_physdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_physdev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_physdev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_pkttype.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_pkttype.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_pkttype.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_pkttype.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_policy.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_policy.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_policy.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_policy.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_quota.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_quota.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_quota.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_quota.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_rateest.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_rateest.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_rateest.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_rateest.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_realm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_realm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_realm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_realm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_recent.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_recent.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_recent.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_recent.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_rpfilter.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_rpfilter.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_rpfilter.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_rpfilter.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_sctp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_sctp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_sctp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_set.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_set.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_set.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_set.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_socket.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_socket.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_socket.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_state.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_state.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_state.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_state.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_statistic.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_statistic.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_statistic.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_statistic.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_string.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_string.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_string.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_string.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_tcpmss.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_tcpmss.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_tcpmss.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_tcpmss.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_tcpudp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_tcpudp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_tcpudp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_tcpudp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_time.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_time.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_time.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_time.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_u32.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_u32.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter/xt_u32.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter/xt_u32.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_arp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_arp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_arp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_arp/arp_tables.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_arp/arp_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_arp/arp_tables.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_arp/arp_tables.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_arp/arpt_mangle.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_arp/arpt_mangle.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_arp/arpt_mangle.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_arp/arpt_mangle.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_802_3.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_802_3.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_802_3.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_802_3.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_among.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_among.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_among.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_among.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arpreply.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_arpreply.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip6.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ip6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_limit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_limit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_limit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_limit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_log.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_log.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_log.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_log.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_m.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_m.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_t.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_mark_t.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nflog.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nflog.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nflog.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_nflog.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_pkttype.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_pkttype.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_redirect.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_redirect.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_redirect.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_redirect.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_stp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_stp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_stp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_stp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ulog.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ulog.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ulog.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_ulog.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_vlan.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_vlan.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_vlan.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebt_vlan.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebtables.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebtables.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_bridge/ebtables.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_bridge/ebtables.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_decnet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_decnet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_decnet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_decnet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ip_tables.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ip_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ip_tables.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ip_tables.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ECN.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ECN.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_LOG.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_LOG.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_REJECT.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_TTL.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_TTL.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ah.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ah.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ah.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ah.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ecn.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ecn.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ttl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv4/ipt_ttl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6_tables.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6_tables.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6_tables.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6_tables.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_HL.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_HL.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_LOG.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_NPT.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ah.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ah.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_frag.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_frag.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_hl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_mh.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_mh.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_opts.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_opts.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_rt.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netfilter_ipv6/ip6t_rt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netlink_diag.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netlink_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netlink_diag.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netlink_diag.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/netrom.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/netrom.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/netrom.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/netrom.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs2.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs2.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs2.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs2.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs3.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs3.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs3.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs3.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs4.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs4.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs4.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs4.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs4_mount.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs4_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs4_mount.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs4_mount.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs_idmap.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs_idmap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs_idmap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs_idmap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfs_mount.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfs_mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfs_mount.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfs_mount.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfsacl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfsacl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfsacl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfsacl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/cld.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/cld.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/cld.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/cld.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/debug.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/debug.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/debug.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/debug.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/export.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/export.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/export.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/export.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/nfsfh.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/nfsfh.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/nfsfh.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/nfsfh.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/stats.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/stats.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nfsd/stats.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nfsd/stats.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nl80211.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nl80211.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nl80211.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nl80211.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nubus.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nubus.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nubus.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nubus.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nvme.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nvme.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nvme.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nvme.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/nvram.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/nvram.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/nvram.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/nvram.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/omap3isp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/omap3isp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/omap3isp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/omap3isp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/omapfb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/omapfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/omapfb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/omapfb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/oom.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/oom.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/oom.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/oom.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/openvswitch.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/openvswitch.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/openvswitch.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/openvswitch.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/packet_diag.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/packet_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/packet_diag.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/packet_diag.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/param.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/param.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/param.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/parport.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/parport.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/parport.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/parport.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/patchkey.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/patchkey.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/patchkey.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/patchkey.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pci.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pci.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pci.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pci.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pci_regs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pci_regs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pci_regs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pci_regs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/perf_event.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/perf_event.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/perf_event.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/perf_event.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/personality.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/personality.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/personality.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/personality.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pfkeyv2.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pfkeyv2.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pfkeyv2.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pfkeyv2.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/phantom.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/phantom.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/phantom.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/phantom.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/phonet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/phonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/phonet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/phonet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pkt_cls.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pkt_cls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pkt_cls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pkt_cls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pkt_sched.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pkt_sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pkt_sched.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pkt_sched.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pktcdvd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pktcdvd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pktcdvd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pktcdvd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pmu.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pmu.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pmu.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pmu.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/poll.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/poll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/poll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/posix_types.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/posix_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/posix_types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/posix_types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ppdev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ppdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ppdev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ppdev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ppp-comp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ppp-comp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ppp-comp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ppp-comp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ppp-ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ppp-ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ppp-ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ppp-ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ppp_defs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ppp_defs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ppp_defs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ppp_defs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/pps.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/pps.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/pps.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/pps.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/prctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/prctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/prctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ptp_clock.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ptp_clock.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ptp_clock.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ptp_clock.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ptrace.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ptrace.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ptrace.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/qnx4_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/qnx4_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/qnx4_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/qnx4_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/qnxtypes.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/qnxtypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/qnxtypes.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/qnxtypes.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/quota.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/quota.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/quota.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/quota.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/radeonfb.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/radeonfb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/radeonfb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/radeonfb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/raid/md_p.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/raid/md_p.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/raid/md_p.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/raid/md_p.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/raid/md_u.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/raid/md_u.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/raid/md_u.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/raid/md_u.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/random.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/random.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/random.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/random.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/raw.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/raw.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/raw.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/raw.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/rds.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/rds.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/rds.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/rds.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/reboot.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/reboot.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/reboot.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/reboot.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/reiserfs_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/reiserfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/reiserfs_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/reiserfs_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/reiserfs_xattr.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/reiserfs_xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/reiserfs_xattr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/reiserfs_xattr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/resource.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/resource.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/resource.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/rfkill.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/rfkill.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/rfkill.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/rfkill.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/romfs_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/romfs_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/romfs_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/romfs_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/rose.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/rose.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/rose.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/rose.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/route.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/route.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/route.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/route.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/rtc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/rtc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/rtc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/rtc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/rtnetlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/rtnetlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/rtnetlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/rtnetlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/scc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/scc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/scc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/scc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sched.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sched.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sched.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/screen_info.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/screen_info.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/screen_info.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/screen_info.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sctp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sctp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sctp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sctp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sdla.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sdla.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sdla.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sdla.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/seccomp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/seccomp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/seccomp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/seccomp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/securebits.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/securebits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/securebits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/securebits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/selinux_netlink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/selinux_netlink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/selinux_netlink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/selinux_netlink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sem.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sem.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sem.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sem.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/serial.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/serial.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/serial.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/serial.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/serial_core.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/serial_core.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/serial_core.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/serial_core.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/serial_reg.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/serial_reg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/serial_reg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/serial_reg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/serio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/serio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/serio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/serio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/shm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/shm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/shm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/shm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/signal.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/signal.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/signal.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/signalfd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/signalfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/signalfd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/signalfd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/snmp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/snmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/snmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/snmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sock_diag.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sock_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sock_diag.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sock_diag.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/socket.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/socket.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/socket.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sockios.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sockios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sockios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sockios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/som.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/som.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/som.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/som.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sonet.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sonet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sonet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sonet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sonypi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sonypi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sonypi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sonypi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sound.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sound.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sound.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sound.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/soundcard.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/soundcard.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/soundcard.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/soundcard.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/spi/spidev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/spi/spidev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/spi/spidev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/spi/spidev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/stat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/stat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/stat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/stddef.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/stddef.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/stddef.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/stddef.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/string.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/string.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/string.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/string.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sunrpc/debug.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sunrpc/debug.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sunrpc/debug.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sunrpc/debug.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/suspend_ioctls.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/suspend_ioctls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/suspend_ioctls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/suspend_ioctls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sw_sync.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sw_sync.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sw_sync.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sw_sync.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/swab.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/swab.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/swab.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/swab.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sync.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sync.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sync.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sync.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/synclink.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/synclink.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/synclink.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/synclink.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sysctl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sysctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sysctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sysctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/sysinfo.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/sysinfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/sysinfo.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/sysinfo.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/taskstats.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/taskstats.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/taskstats.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/taskstats.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_csum.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_csum.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_csum.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_csum.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_defact.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_defact.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_defact.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_defact.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_gact.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_gact.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_gact.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_gact.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_ipt.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_ipt.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_ipt.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_ipt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_mirred.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_mirred.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_mirred.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_mirred.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_nat.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_nat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_nat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_nat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_pedit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_pedit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_pedit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_pedit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_skbedit.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_skbedit.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_act/tc_skbedit.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_act/tc_skbedit.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_cmp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_cmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_cmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_cmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_meta.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_meta.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_meta.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_meta.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_nbyte.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_nbyte.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_nbyte.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_nbyte.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_text.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_text.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tc_ematch/tc_em_text.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tc_ematch/tc_em_text.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tcp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tcp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tcp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tcp_metrics.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tcp_metrics.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tcp_metrics.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tcp_metrics.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/telephony.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/telephony.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/telephony.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/telephony.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/termios.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/termios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/termios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/time.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/time.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/time.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/time.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/times.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/times.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/times.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/times.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/timex.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/timex.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/timex.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/timex.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tiocl.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tiocl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tiocl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tiocl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tipc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tipc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tipc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tipc_config.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tipc_config.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tipc_config.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tipc_config.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/toshiba.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/toshiba.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/toshiba.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/toshiba.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tty.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tty.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tty.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tty.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/tty_flags.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/tty_flags.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/tty_flags.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/tty_flags.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/types.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/udf_fs_i.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/udf_fs_i.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/udf_fs_i.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/udf_fs_i.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/udp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/udp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/udp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/udp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/uhid.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/uhid.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/uhid.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/uhid.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/uinput.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/uinput.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/uinput.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/uinput.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/uio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/uio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/uio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/uio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/ultrasound.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/ultrasound.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/ultrasound.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/ultrasound.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/un.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/un.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/un.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/un.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/unistd.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/unistd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/unistd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/unix_diag.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/unix_diag.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/unix_diag.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/unix_diag.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/audio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/audio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/audio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/audio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/cdc-wdm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/cdc-wdm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/cdc-wdm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/cdc-wdm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/cdc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/cdc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/cdc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/cdc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/ch11.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/ch11.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/ch11.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/ch11.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/ch9.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/ch9.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/ch9.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/ch9.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/f_accessory.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/f_accessory.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/f_accessory.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/f_accessory.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/f_mtp.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/f_mtp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/f_mtp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/f_mtp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/functionfs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/functionfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/functionfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/functionfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/g_printer.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/g_printer.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/g_printer.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/g_printer.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/gadgetfs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/gadgetfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/gadgetfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/gadgetfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/midi.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/midi.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/midi.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/midi.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/tmc.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/tmc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/tmc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/tmc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usb/video.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usb/video.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usb/video.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usb/video.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/usbdevice_fs.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/usbdevice_fs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/usbdevice_fs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/usbdevice_fs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/utime.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/utime.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/utime.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/utsname.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/utsname.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/utsname.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/utsname.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/uuid.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/uuid.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/uuid.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/uuid.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/uvcvideo.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/uvcvideo.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/uvcvideo.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/uvcvideo.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-common.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-common.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-common.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-common.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-controls.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-controls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-controls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-controls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-dv-timings.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-dv-timings.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-dv-timings.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-dv-timings.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-mediabus.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-mediabus.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-mediabus.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-mediabus.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-subdev.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-subdev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/v4l2-subdev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/v4l2-subdev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/version.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/version.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/version.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/version.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/veth.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/veth.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/veth.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/veth.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/vfio.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/vfio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/vfio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/vfio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/vhost.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/vhost.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/vhost.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/vhost.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/videodev2.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/videodev2.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/videodev2.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/videodev2.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_9p.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_9p.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_9p.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_9p.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_balloon.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_balloon.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_balloon.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_balloon.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_blk.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_blk.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_blk.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_blk.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_config.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_config.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_config.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_config.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_console.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_console.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_console.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_console.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_ids.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_ids.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_ids.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_ids.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_net.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_net.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_net.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_net.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_pci.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_pci.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_pci.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_pci.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_ring.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_ring.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_ring.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_ring.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_rng.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_rng.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/virtio_rng.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/virtio_rng.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/vm_sockets.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/vm_sockets.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/vm_sockets.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/vm_sockets.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/vsp1.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/vsp1.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/vsp1.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/vsp1.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/vt.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/vt.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/vt.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/vt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/wait.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/wait.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/wait.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/wait.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/wanrouter.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/wanrouter.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/wanrouter.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/wanrouter.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/watchdog.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/watchdog.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/watchdog.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/watchdog.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/wimax.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/wimax.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/wimax.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/wimax.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/wimax/i2400m.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/wimax/i2400m.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/wimax/i2400m.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/wimax/i2400m.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/wireless.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/wireless.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/wireless.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/wireless.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/x25.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/x25.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/x25.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/x25.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/xattr.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/xattr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/xattr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/xfrm.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/xfrm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/xfrm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/xfrm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/zorro.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/zorro.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/zorro.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/zorro.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/linux/zorro_ids.h b/9/platforms/android-21/arch-x86_64/usr/include/linux/zorro_ids.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/linux/zorro_ids.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/linux/zorro_ids.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/locale.h b/9/platforms/android-21/arch-x86_64/usr/include/locale.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/locale.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/locale.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/asm.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/asm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/asm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/asm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/elf_machdep.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/elf_machdep.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/elf_machdep.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/elf_machdep.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/endian.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/endian.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/exec.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/exec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/exec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/exec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/fenv.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/fenv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/fenv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/fenv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/fpu.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/fpu.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/fpu.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/fpu.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/ieee.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/ieee.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/ieee.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/ieee.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/setjmp.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/setjmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/setjmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/setjmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/machine/wchar_limits.h b/9/platforms/android-21/arch-x86_64/usr/include/machine/wchar_limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/machine/wchar_limits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/machine/wchar_limits.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/malloc.h b/9/platforms/android-21/arch-x86_64/usr/include/malloc.h
similarity index 85%
copy from 9/platforms/android-19/arch-arm64/usr/include/malloc.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/malloc.h
index 1e92b7d..e6ea276 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/malloc.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/malloc.h
@@ -27,19 +27,12 @@
 
 __BEGIN_DECLS
 
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ < 5)
 extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
 extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
 extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
-#else
-extern void* malloc(size_t byte_count) __mallocfunc __wur;
-extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
-extern void* realloc(void* p, size_t byte_count) __wur;
-extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
-#endif
-
 extern void free(void* p);
+
+extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
 extern size_t malloc_usable_size(const void* p);
 
 #ifndef STRUCT_MALLINFO_DECLARED
diff --git a/9/platforms/android-19/arch-arm64/usr/include/math.h b/9/platforms/android-21/arch-x86_64/usr/include/math.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/math.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/math.h
index 8369d6e..e872388 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/math.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/math.h
@@ -512,7 +512,8 @@
 double	__builtin_fma(double, double, double) __NDK_FPABI_MATH__;
 double	__builtin_hypot(double, double) __NDK_FPABI_MATH__;
 int	__builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
-#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7)
+/* See upstream bug http://llvm.org/bugs/show_bug.cgi?id=20958 */
 int	__builtin_isinf(double) __NDK_FPABI_MATH__ __pure2;
 int	__builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
 #else
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaCodec.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaCodec.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaCodec.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaCodec.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaCrypto.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaCrypto.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaCrypto.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaCrypto.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaDrm.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaDrm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaDrm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaDrm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaError.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaError.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaError.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaError.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaExtractor.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaExtractor.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaExtractor.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaExtractor.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaFormat.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaFormat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaFormat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaFormat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaMuxer.h b/9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaMuxer.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/media/NdkMediaMuxer.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/media/NdkMediaMuxer.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/memory.h b/9/platforms/android-21/arch-x86_64/usr/include/memory.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/memory.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/memory.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/mntent.h b/9/platforms/android-21/arch-x86_64/usr/include/mntent.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/mntent.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/mntent.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/ethernet.h b/9/platforms/android-21/arch-x86_64/usr/include/net/ethernet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/ethernet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/ethernet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/ethertypes.h b/9/platforms/android-21/arch-x86_64/usr/include/net/ethertypes.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/ethertypes.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/ethertypes.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/if.h b/9/platforms/android-21/arch-x86_64/usr/include/net/if.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/if.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/if.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/if_arp.h b/9/platforms/android-21/arch-x86_64/usr/include/net/if_arp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/if_arp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/if_arp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/if_ether.h b/9/platforms/android-21/arch-x86_64/usr/include/net/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/if_ether.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/if_ether.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/if_ieee1394.h b/9/platforms/android-21/arch-x86_64/usr/include/net/if_ieee1394.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/if_ieee1394.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/if_ieee1394.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/if_packet.h b/9/platforms/android-21/arch-x86_64/usr/include/net/if_packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/if_packet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/if_packet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/if_types.h b/9/platforms/android-21/arch-x86_64/usr/include/net/if_types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/if_types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/if_types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/net/route.h b/9/platforms/android-21/arch-x86_64/usr/include/net/route.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/net/route.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/net/route.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netdb.h b/9/platforms/android-21/arch-x86_64/usr/include/netdb.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netdb.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netdb.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/ether.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/ether.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/ether.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/icmp6.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/icmp6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/icmp6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/icmp6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/if_ether.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/if_ether.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/if_ether.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/if_ether.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/in.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/in.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/in.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/in.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/in6.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/in6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/in6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/in6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/in_systm.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/in_systm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/in_systm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/in_systm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/ip.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/ip.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/ip.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/ip.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/ip6.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/ip6.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/ip6.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/ip6.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/ip_icmp.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/ip_icmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/ip_icmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/ip_icmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/tcp.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/tcp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/tcp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/tcp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netinet/udp.h b/9/platforms/android-21/arch-x86_64/usr/include/netinet/udp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netinet/udp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netinet/udp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/netpacket/packet.h b/9/platforms/android-21/arch-x86_64/usr/include/netpacket/packet.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/netpacket/packet.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/netpacket/packet.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h b/9/platforms/android-21/arch-x86_64/usr/include/nsswitch.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/nsswitch.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/nsswitch.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/pathconf.h b/9/platforms/android-21/arch-x86_64/usr/include/pathconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/pathconf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/pathconf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/paths.h b/9/platforms/android-21/arch-x86_64/usr/include/paths.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/paths.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/paths.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/poll.h b/9/platforms/android-21/arch-x86_64/usr/include/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/poll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/poll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/pthread.h b/9/platforms/android-21/arch-x86_64/usr/include/pthread.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/pthread.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/pthread.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/pwd.h b/9/platforms/android-21/arch-x86_64/usr/include/pwd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/pwd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/pwd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/regex.h b/9/platforms/android-21/arch-x86_64/usr/include/regex.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/regex.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/regex.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/resolv.h b/9/platforms/android-21/arch-x86_64/usr/include/resolv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/resolv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/resolv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sched.h b/9/platforms/android-21/arch-x86_64/usr/include/sched.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sched.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sched.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/search.h b/9/platforms/android-21/arch-x86_64/usr/include/search.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/search.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/search.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/semaphore.h b/9/platforms/android-21/arch-x86_64/usr/include/semaphore.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/semaphore.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/semaphore.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/setjmp.h b/9/platforms/android-21/arch-x86_64/usr/include/setjmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/setjmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/setjmp.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sgidefs.h b/9/platforms/android-21/arch-x86_64/usr/include/sgidefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sgidefs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sgidefs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sgtty.h b/9/platforms/android-21/arch-x86_64/usr/include/sgtty.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sgtty.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sgtty.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/signal.h b/9/platforms/android-21/arch-x86_64/usr/include/signal.h
similarity index 98%
copy from 9/platforms/android-19/arch-arm64/usr/include/signal.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/signal.h
index f1849c5..e23e65b 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/signal.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/signal.h
@@ -48,6 +48,9 @@
 #  include <linux/signal.h>
 #endif
 
+#include <sys/ucontext.h>
+#define __BIONIC_HAVE_UCONTEXT_T
+
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h
index 3db25a7..58cb1bc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdatomic.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/stdatomic.h
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 
 
-#if defined(__cplusplus) && defined(_USING_LIBCXX)
+#if defined(__cplusplus) && __cplusplus >= 201103L && defined(_USING_LIBCXX)
 # ifdef __clang__
 #  if __has_feature(cxx_atomic)
 #   define _STDATOMIC_HAVE_ATOMIC
@@ -89,6 +89,7 @@
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_consume;
+using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdint.h b/9/platforms/android-21/arch-x86_64/usr/include/stdint.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/stdint.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/stdint.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/stdio.h b/9/platforms/android-21/arch-x86_64/usr/include/stdio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/stdio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/stdio.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h b/9/platforms/android-21/arch-x86_64/usr/include/stdlib.h
similarity index 96%
copy from 9/platforms/android-19/arch-arm64/usr/include/stdlib.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/stdlib.h
index a0f017c..e04475c 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/stdlib.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/stdlib.h
@@ -76,8 +76,8 @@
 extern long double strtold(const char*, char**) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
 
 extern long double strtold_l(const char *, char **, locale_t) __LIBC_ABI_PUBLIC__ __NDK_FPABI__;
-extern long long strtoll_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
-extern unsigned long long strtoull_l(const char *, char **, size_t, locale_t) __LIBC_ABI_PUBLIC__;
+extern long long strtoll_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
+extern unsigned long long strtoull_l(const char *, char **, int, locale_t) __LIBC_ABI_PUBLIC__;
 
 extern int atoi(const char*) __purefunc;
 extern long atol(const char*) __purefunc;
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/string.h b/9/platforms/android-21/arch-x86_64/usr/include/string.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/string.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/string.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/strings.h b/9/platforms/android-21/arch-x86_64/usr/include/strings.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/strings.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/strings.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/auxv.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/auxv.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/auxv.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/auxv.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/cachectl.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/cachectl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/cachectl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/cachectl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/capability.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/capability.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/capability.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/capability.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/cdefs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/cdefs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/cdefs_elf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/cdefs_elf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/cdefs_elf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/endian.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/endian.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/endian.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/epoll.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/epoll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/epoll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/epoll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/errno.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/errno.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/errno.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/errno.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/eventfd.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/eventfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/eventfd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/eventfd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/file.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/file.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/file.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/file.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/fsuid.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/fsuid.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/fsuid.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/fsuid.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/glibc-syscalls.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/glibc-syscalls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/glibc-syscalls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/glibc-syscalls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/inotify.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/inotify.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/inotify.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/inotify.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ioctl.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ioctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ioctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ioctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ioctl_compat.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ioctl_compat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ioctl_compat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ioctl_compat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ipc.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ipc.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ipc.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ipc.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/klog.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/klog.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/klog.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/klog.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/limits.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/limits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/limits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/limits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/mman.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/mman.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/mman.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/mman.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/mount.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/mount.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/mount.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/mount.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/msg.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/msg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/msg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/msg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/param.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/param.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/param.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/param.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/personality.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/personality.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/personality.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/personality.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/poll.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/poll.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/poll.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/poll.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/prctl.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/prctl.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/prctl.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/prctl.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ptrace.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ptrace.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ptrace.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ptrace.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/queue.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/queue.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/queue.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/queue.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/reboot.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/reboot.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/reboot.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/reboot.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/reg.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/reg.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/reg.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/reg.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/resource.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/resource.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/resource.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/resource.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/select.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/select.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/select.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/select.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/sem.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/sem.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/sem.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/sem.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/sendfile.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/sendfile.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/sendfile.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/sendfile.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/shm.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/shm.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/shm.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/shm.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/signal.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/signal.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/signal.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/signal.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/signalfd.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/signalfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/signalfd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/signalfd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/socket.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/socket.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/socket.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/socket.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/socketcalls.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/socketcalls.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/socketcalls.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/socketcalls.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/stat.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/stat.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/stat.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/statfs.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/statfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/statfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/statfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/statvfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/statvfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/statvfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/swap.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/swap.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/swap.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/swap.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/syscall.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/syscall.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/syscall.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/sysconf.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/sysconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/sysconf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/sysconf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/sysinfo.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/sysinfo.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/sysinfo.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/sysinfo.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/syslimits.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/syslimits.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/syslimits.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/syslimits.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/sysmacros.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/sysmacros.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/sysmacros.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/sysmacros.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/system_properties.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/system_properties.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/system_properties.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/system_properties.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/time.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/time.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/time.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/time.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/timerfd.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/timerfd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/timerfd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/timerfd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/times.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/times.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/times.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/times.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/timex.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/timex.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/timex.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/timex.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ttychars.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ttychars.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ttychars.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ttychars.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ttydefaults.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ttydefaults.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ttydefaults.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ttydefaults.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ttydev.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ttydev.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ttydev.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ttydev.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/types.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/types.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/types.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/types.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h
similarity index 96%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h
index f62380d..dd2a0bb 100644
--- a/9/platforms/android-19/arch-x86_64/usr/include/sys/ucontext.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/sys/ucontext.h
@@ -68,11 +68,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on ARM.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
   char __padding[120];
   unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
@@ -80,6 +78,10 @@
 
 #elif defined(__aarch64__)
 
+#define NGREG 34 /* x0..x30 + sp + pc + pstate */
+typedef unsigned long greg_t;
+typedef greg_t gregset_t[NGREG];
+
 #include <asm/sigcontext.h>
 typedef struct sigcontext mcontext_t;
 
@@ -152,11 +154,9 @@
   struct ucontext* uc_link;
   stack_t uc_stack;
   mcontext_t uc_mcontext;
+  sigset_t uc_sigmask;
   // Android has a wrong (smaller) sigset_t on x86.
-  union {
-    sigset_t bionic;
-    uint32_t kernel[2];
-  } uc_sigmask;
+  uint32_t __padding_rt_sigset;
   struct _libc_fpstate __fpregs_mem;
 } ucontext_t;
 
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/uio.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/uio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/uio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/uio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/un.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/un.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/un.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/un.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/user.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/user.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/user.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/user.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/utime.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/utime.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/utime.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/utsname.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/utsname.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/utsname.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/utsname.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/vfs.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/vfs.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/vfs.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/vt.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/vt.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/vt.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/vt.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/wait.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/wait.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/wait.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/wait.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/sys/xattr.h b/9/platforms/android-21/arch-x86_64/usr/include/sys/xattr.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/sys/xattr.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/sys/xattr.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/syslog.h b/9/platforms/android-21/arch-x86_64/usr/include/syslog.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/syslog.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/syslog.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/termio.h b/9/platforms/android-21/arch-x86_64/usr/include/termio.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/termio.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/termio.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/termios.h b/9/platforms/android-21/arch-x86_64/usr/include/termios.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/termios.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/termios.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/thread_db.h b/9/platforms/android-21/arch-x86_64/usr/include/thread_db.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/thread_db.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/thread_db.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/time.h b/9/platforms/android-21/arch-x86_64/usr/include/time.h
similarity index 91%
copy from 9/platforms/android-19/arch-arm64/usr/include/time.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/time.h
index 0a5f18b..aa72fcc 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/time.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/time.h
@@ -85,8 +85,10 @@
 
 extern clock_t clock(void) __LIBC_ABI_PUBLIC__;
 
-extern int clock_getres(int, struct timespec*) __LIBC_ABI_PUBLIC__;
-extern int clock_gettime(int, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__;
+extern int clock_settime(clockid_t, const struct timespec*) __LIBC_ABI_PUBLIC__;
 
 extern int timer_create(int, struct sigevent*, timer_t*) __LIBC_ABI_PUBLIC__;
 extern int timer_delete(timer_t) __LIBC_ABI_PUBLIC__;
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/time64.h b/9/platforms/android-21/arch-x86_64/usr/include/time64.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/time64.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/time64.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/uchar.h b/9/platforms/android-21/arch-x86_64/usr/include/uchar.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/uchar.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/uchar.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/ucontext.h b/9/platforms/android-21/arch-x86_64/usr/include/ucontext.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/ucontext.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/ucontext.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/unistd.h b/9/platforms/android-21/arch-x86_64/usr/include/unistd.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/unistd.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/unistd.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/util.h b/9/platforms/android-21/arch-x86_64/usr/include/util.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/util.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/util.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/utime.h b/9/platforms/android-21/arch-x86_64/usr/include/utime.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/utime.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/utime.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/utmp.h b/9/platforms/android-21/arch-x86_64/usr/include/utmp.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/utmp.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/utmp.h
diff --git a/9/platforms/android-19/arch-arm64/usr/include/wchar.h b/9/platforms/android-21/arch-x86_64/usr/include/wchar.h
similarity index 99%
copy from 9/platforms/android-19/arch-arm64/usr/include/wchar.h
copy to 9/platforms/android-21/arch-x86_64/usr/include/wchar.h
index f421d4c..cfa9b74 100644
--- a/9/platforms/android-19/arch-arm64/usr/include/wchar.h
+++ b/9/platforms/android-21/arch-x86_64/usr/include/wchar.h
@@ -151,8 +151,8 @@
 extern int               wprintf(const wchar_t *, ...);
 extern int               wscanf(const wchar_t *, ...);
 
-extern long long          wcstoll_l(const wchar_t *, wchar_t **, size_t, locale_t);
-extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, size_t, locale_t);
+extern long long          wcstoll_l(const wchar_t *, wchar_t **, int, locale_t);
+extern unsigned long long wcstoull_l(const wchar_t *, wchar_t **, int, locale_t);
 extern long double        wcstold_l(const wchar_t *, wchar_t **, locale_t ) __NDK_FPABI__;
 
 extern int    wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/wctype.h b/9/platforms/android-21/arch-x86_64/usr/include/wctype.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/wctype.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/wctype.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/xlocale.h b/9/platforms/android-21/arch-x86_64/usr/include/xlocale.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/xlocale.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/xlocale.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/zconf.h b/9/platforms/android-21/arch-x86_64/usr/include/zconf.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/zconf.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/zconf.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/include/zlib.h b/9/platforms/android-21/arch-x86_64/usr/include/zlib.h
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/include/zlib.h
rename to 9/platforms/android-21/arch-x86_64/usr/include/zlib.h
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib b/9/platforms/android-21/arch-x86_64/usr/lib
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/lib
rename to 9/platforms/android-21/arch-x86_64/usr/lib
diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o
new file mode 100644
index 0000000..cbec8c9
--- /dev/null
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_dynamic.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o
new file mode 100644
index 0000000..728703f
--- /dev/null
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_so.o
Binary files differ
diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o
new file mode 100644
index 0000000..cbec8c9
--- /dev/null
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/crtbegin_static.o
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtend_android.o
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/crtend_android.o
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o b/9/platforms/android-21/arch-x86_64/usr/lib64/crtend_so.o
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/crtend_so.o
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so
similarity index 80%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so
index e082dc3..aba9ec3 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libEGL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so
similarity index 71%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so
index 46ed256..ce0af7f 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv1_CM.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so
similarity index 72%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so
index a68e4b5..8f4ad33 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv2.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so
similarity index 69%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so
index fa10b53..3fc5fb6 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libGLESv3.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so
similarity index 62%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so
index c2cd543..39473cf 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenMAXAL.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so
similarity index 63%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so
index ae3f67e..2ea32f8 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libOpenSLES.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so
similarity index 66%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so
index 9dd350a..ff64d42 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libandroid.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libc.a
similarity index 100%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libc.a
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libc.a
Binary files differ
diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libc.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libc.so
new file mode 100755
index 0000000..eef0657
--- /dev/null
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libc.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so
similarity index 85%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so
index 3b5b4fb..9f1c362 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libdl.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so
similarity index 87%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so
index 1d35f70..29a632a 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libjnigraphics.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so b/9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so
similarity index 84%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so
index 98699bb..5c480eb 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/liblog.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.a
similarity index 78%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libm.a
index 771b524..991cc05 100644
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.a
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.so
similarity index 74%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libm.so
index 2a689ad..c04933d 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libm.so
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libmediandk.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so
similarity index 62%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libmediandk.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so
index 1dd4550..b9da256 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libmediandk.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libmediandk.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a
new file mode 100644
index 0000000..18a78a4
--- /dev/null
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.a
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so
similarity index 82%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so
index a9c373b..cec8fa5 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libstdc++.so
Binary files differ
diff --git a/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a
new file mode 100644
index 0000000..ca200a4
--- /dev/null
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.a
Binary files differ
diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.so b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.so
similarity index 71%
rename from 9/platforms/android-19/arch-x86_64/usr/lib64/libz.so
rename to 9/platforms/android-21/arch-x86_64/usr/lib64/libz.so
index 0d6f0b3..5fc97f3 100755
--- a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.so
+++ b/9/platforms/android-21/arch-x86_64/usr/lib64/libz.so
Binary files differ
diff --git a/9/platforms/android-8/arch-arm64 b/9/platforms/android-8/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-8/arch-arm64
+++ b/9/platforms/android-8/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-8/arch-mips64 b/9/platforms/android-8/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-8/arch-mips64
+++ b/9/platforms/android-8/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-8/arch-x86_64 b/9/platforms/android-8/arch-x86_64
index 17a0bc6..8e01f87 120000
--- a/9/platforms/android-8/arch-x86_64
+++ b/9/platforms/android-8/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/platforms/android-9/arch-arm64 b/9/platforms/android-9/arch-arm64
index 26e3f4d..bfcb6b0 120000
--- a/9/platforms/android-9/arch-arm64
+++ b/9/platforms/android-9/arch-arm64
@@ -1 +1 @@
-../android-19/arch-arm64
\ No newline at end of file
+../android-21/arch-arm64
\ No newline at end of file
diff --git a/9/platforms/android-9/arch-mips64 b/9/platforms/android-9/arch-mips64
index 6812704..6021327 120000
--- a/9/platforms/android-9/arch-mips64
+++ b/9/platforms/android-9/arch-mips64
@@ -1 +1 @@
-../android-19/arch-mips64
\ No newline at end of file
+../android-21/arch-mips64
\ No newline at end of file
diff --git a/9/platforms/android-9/arch-x86_64 b/9/platforms/android-9/arch-x86_64
index b729d90..8e01f87 120000
--- a/9/platforms/android-9/arch-x86_64
+++ b/9/platforms/android-9/arch-x86_64
@@ -1 +1 @@
-../android-19/arch-x86_64/
\ No newline at end of file
+../android-21/arch-x86_64
\ No newline at end of file
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/backward/hashtable.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/backward/hashtable.h
index 86121af..158f2a5 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/backward/hashtable.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/backward/hashtable.h
@@ -125,7 +125,8 @@
       _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
       : _M_cur(__n), _M_ht(__tab) { }
 
-      _Hashtable_iterator() { }
+      _Hashtable_iterator()
+      : _M_cur(0), _M_ht(0) { }
 
       reference
       operator*() const
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/atomic_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/atomic_base.h
index 242459a..1fc0ebb 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/atomic_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/atomic_base.h
@@ -675,10 +675,10 @@
 
       // Factored out to facilitate explicit specialization.
       constexpr ptrdiff_t
-      _M_type_size(ptrdiff_t __d) { return __d * sizeof(_PTp); }
+      _M_type_size(ptrdiff_t __d) const { return __d * sizeof(_PTp); }
 
       constexpr ptrdiff_t
-      _M_type_size(ptrdiff_t __d) volatile { return __d * sizeof(_PTp); }
+      _M_type_size(ptrdiff_t __d) const volatile { return __d * sizeof(_PTp); }
 
     public:
       __atomic_base() noexcept = default;
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/basic_string.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/basic_string.h
index cd60376..93ceb6d 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/basic_string.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/basic_string.h
@@ -2811,7 +2811,23 @@
     inline basic_istream<_CharT, _Traits>&
     getline(basic_istream<_CharT, _Traits>& __is,
 	    basic_string<_CharT, _Traits, _Alloc>& __str)
-    { return getline(__is, __str, __is.widen('\n')); }
+    { return std::getline(__is, __str, __is.widen('\n')); }
+
+#if __cplusplus >= 201103L
+  /// Read a line from an rvalue stream into a string.
+  template<typename _CharT, typename _Traits, typename _Alloc>
+    inline basic_istream<_CharT, _Traits>&
+    getline(basic_istream<_CharT, _Traits>&& __is,
+	    basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
+    { return std::getline(__is, __str, __delim); }
+
+  /// Read a line from an rvalue stream into a string.
+  template<typename _CharT, typename _Traits, typename _Alloc>
+    inline basic_istream<_CharT, _Traits>&
+    getline(basic_istream<_CharT, _Traits>&& __is,
+	    basic_string<_CharT, _Traits, _Alloc>& __str)
+    { return std::getline(__is, __str); }
+#endif
 
   template<>
     basic_istream<char>&
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/deque.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/deque.tcc
index ebf5d3a..9721765 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/deque.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/deque.tcc
@@ -150,6 +150,10 @@
       deque<_Tp, _Alloc>::
       emplace(const_iterator __position, _Args&&... __args)
       {
+#if __google_stl_debug_vector
+	if (__position < this->begin() || __position > this->end())
+	  __throw_out_of_range(__N("emplace() at invalid position"));
+#endif
 	if (__position._M_cur == this->_M_impl._M_start._M_cur)
 	  {
 	    emplace_front(std::forward<_Args>(__args)...);
@@ -177,6 +181,10 @@
     insert(iterator __position, const value_type& __x)
 #endif
     {
+#if __google_stl_debug_vector
+      if (__position < this->begin() || __position > this->end())
+	__throw_out_of_range(__N("insert() at invalid position"));
+#endif
       if (__position._M_cur == this->_M_impl._M_start._M_cur)
 	{
 	  push_front(__x);
@@ -198,6 +206,10 @@
     deque<_Tp, _Alloc>::
     _M_erase(iterator __position)
     {
+#if __google_stl_debug_deque
+      if (__position < this->begin() || __position >= this->end())
+	__throw_logic_error("erase() at invalid position");
+#endif
       iterator __next = __position;
       ++__next;
       const difference_type __index = __position - begin();
@@ -221,6 +233,10 @@
     deque<_Tp, _Alloc>::
     _M_erase(iterator __first, iterator __last)
     {
+#if __google_stl_debug_deque
+      if (__first < this->begin() || __first > __last || __last > this->end())
+	  __throw_logic_error("erase() invalid range");
+#endif
       if (__first == __last)
 	return __first;
       else if (__first == begin() && __last == end())
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/hashtable.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/hashtable.h
index 22e17d2..588e69c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/hashtable.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/hashtable.h
@@ -316,14 +316,49 @@
       size_type			_M_element_count;
       _RehashPolicy		_M_rehash_policy;
 
+      // A single bucket used when only need for 1 bucket. Especially
+      // interesting in move semantic to leave hashtable with only 1 buckets
+      // which is not allocated so that we can have those operations noexcept
+      // qualified.
+      // Note that we can't leave hashtable with 0 bucket without adding
+      // numerous checks in the code to avoid 0 modulus.
+      __bucket_type		_M_single_bucket;
+
+      bool
+      _M_uses_single_bucket(__bucket_type* __bkts) const
+      { return __builtin_expect(_M_buckets == &_M_single_bucket, false); }
+
+      bool
+      _M_uses_single_bucket() const
+      { return _M_uses_single_bucket(_M_buckets); }
+
       __hashtable_alloc&
       _M_base_alloc() { return *this; }
 
-      using __hashtable_alloc::_M_deallocate_buckets;
+      __bucket_type*
+      _M_allocate_buckets(size_type __n)
+      {
+	if (__builtin_expect(__n == 1, false))
+	  {
+	    _M_single_bucket = nullptr;
+	    return &_M_single_bucket;
+	  }
+
+	return __hashtable_alloc::_M_allocate_buckets(__n);
+      }
+
+      void
+      _M_deallocate_buckets(__bucket_type* __bkts, size_type __n)
+      {
+	if (_M_uses_single_bucket(__bkts))
+	  return;
+
+	__hashtable_alloc::_M_deallocate_buckets(__bkts, __n);
+      }
 
       void
       _M_deallocate_buckets()
-      { this->_M_deallocate_buckets(_M_buckets, _M_bucket_count); }
+      { _M_deallocate_buckets(_M_buckets, _M_bucket_count); }
 
       // Gets bucket begin, deals with the fact that non-empty buckets contain
       // their before begin node.
@@ -703,11 +738,7 @@
 
       size_type
       erase(const key_type& __k)
-      {
-	if (__builtin_expect(_M_bucket_count == 0, false))
-	  return 0;
-	return _M_erase(__unique_keys(), __k);
-      }
+      { return _M_erase(__unique_keys(), __k); }
 
       iterator
       erase(const_iterator, const_iterator);
@@ -768,7 +799,7 @@
       _M_rehash_policy()
     {
       _M_bucket_count = _M_rehash_policy._M_next_bkt(__bucket_hint);
-      _M_buckets = this->_M_allocate_buckets(_M_bucket_count);
+      _M_buckets = _M_allocate_buckets(_M_bucket_count);
     }
 
   template<typename _Key, typename _Value,
@@ -796,7 +827,7 @@
 	    std::max(_M_rehash_policy._M_bkt_for_elements(__nb_elems),
 		     __bucket_hint));
 
-	_M_buckets = this->_M_allocate_buckets(_M_bucket_count);
+	_M_buckets = _M_allocate_buckets(_M_bucket_count);
 	__try
 	  {
 	    for (; __f != __l; ++__f)
@@ -833,9 +864,9 @@
 	      {
 		// Replacement allocator cannot free existing storage.
 		this->_M_deallocate_nodes(_M_begin());
-		if (__builtin_expect(_M_bucket_count != 0, true))
-		  _M_deallocate_buckets();
-		_M_reset();
+		_M_before_begin._M_nxt = nullptr;
+		_M_deallocate_buckets();
+		_M_buckets = nullptr;
 		std::__alloc_on_copy(__this_alloc, __that_alloc);
 		__hashtable_base::operator=(__ht);
 		_M_bucket_count = __ht._M_bucket_count;
@@ -867,7 +898,7 @@
 	if (_M_bucket_count != __ht._M_bucket_count)
 	  {
 	    __former_buckets = _M_buckets;
-	    _M_buckets = this->_M_allocate_buckets(__ht._M_bucket_count);
+	    _M_buckets = _M_allocate_buckets(__ht._M_bucket_count);
 	    _M_bucket_count = __ht._M_bucket_count;
 	  }
 	else
@@ -885,8 +916,7 @@
 		      [&__roan](const __node_type* __n)
 		      { return __roan(__n->_M_v()); });
 	    if (__former_buckets)
-	      this->_M_deallocate_buckets(__former_buckets,
-					  __former_bucket_count);
+	      _M_deallocate_buckets(__former_buckets, __former_bucket_count);
 	  }
 	__catch(...)
 	  {
@@ -917,7 +947,7 @@
       {
 	__bucket_type* __buckets = nullptr;
 	if (!_M_buckets)
-	  _M_buckets = __buckets = this->_M_allocate_buckets(_M_bucket_count);
+	  _M_buckets = __buckets = _M_allocate_buckets(_M_bucket_count);
 
 	__try
 	  {
@@ -964,8 +994,9 @@
     _M_reset() noexcept
     {
       _M_rehash_policy._M_reset();
-      _M_bucket_count = 0;
-      _M_buckets = nullptr;
+      _M_bucket_count = 1;
+      _M_single_bucket = nullptr;
+      _M_buckets = &_M_single_bucket;
       _M_before_begin._M_nxt = nullptr;
       _M_element_count = 0;
     }
@@ -980,12 +1011,16 @@
     _M_move_assign(_Hashtable&& __ht, std::true_type)
     {
       this->_M_deallocate_nodes(_M_begin());
-      if (__builtin_expect(_M_bucket_count != 0, true))
-	_M_deallocate_buckets();
-
+      _M_deallocate_buckets();
       __hashtable_base::operator=(std::move(__ht));
       _M_rehash_policy = __ht._M_rehash_policy;
-      _M_buckets = __ht._M_buckets;
+      if (!__ht._M_uses_single_bucket())
+	_M_buckets = __ht._M_buckets;
+      else
+	{
+	  _M_buckets = &_M_single_bucket;
+	  _M_single_bucket = __ht._M_single_bucket;
+	}
       _M_bucket_count = __ht._M_bucket_count;
       _M_before_begin._M_nxt = __ht._M_before_begin._M_nxt;
       _M_element_count = __ht._M_element_count;
@@ -1019,7 +1054,7 @@
 	  if (_M_bucket_count != __ht._M_bucket_count)
 	    {
 	      __former_buckets = _M_buckets;
-	      _M_buckets = this->_M_allocate_buckets(__ht._M_bucket_count);
+	      _M_buckets = _M_allocate_buckets(__ht._M_bucket_count);
 	      _M_bucket_count = __ht._M_bucket_count;
 	    }
 	  else
@@ -1093,10 +1128,18 @@
       _M_element_count(__ht._M_element_count),
       _M_rehash_policy(__ht._M_rehash_policy)
     {
+      // Update, if necessary, buckets if __ht is using its single bucket.
+      if (__ht._M_uses_single_bucket())
+	{
+	  _M_buckets = &_M_single_bucket;
+	  _M_single_bucket = __ht._M_single_bucket;
+	}
+
       // Update, if necessary, bucket pointing to before begin that hasn't
       // moved.
       if (_M_begin())
 	_M_buckets[_M_bucket_index(_M_begin())] = &_M_before_begin;
+
       __ht._M_reset();
     }
 
@@ -1139,7 +1182,14 @@
     {
       if (__ht._M_node_allocator() == this->_M_node_allocator())
 	{
-	  _M_buckets = __ht._M_buckets;
+	  if (__ht._M_uses_single_bucket())
+	    {
+	      _M_buckets = &_M_single_bucket;
+	      _M_single_bucket = __ht._M_single_bucket;
+	    }
+	  else
+	    _M_buckets = __ht._M_buckets;
+
 	  _M_before_begin._M_nxt = __ht._M_before_begin._M_nxt;
 	  // Update, if necessary, bucket pointing to before begin that hasn't
 	  // moved.
@@ -1189,15 +1239,34 @@
 
       std::__alloc_on_swap(this->_M_node_allocator(), __x._M_node_allocator());
       std::swap(_M_rehash_policy, __x._M_rehash_policy);
-      std::swap(_M_buckets, __x._M_buckets);
+
+      // Deal properly with potentially moved instances.
+      if (this->_M_uses_single_bucket())
+	{
+	  if (!__x._M_uses_single_bucket())
+	    {
+	      _M_buckets = __x._M_buckets;
+	      __x._M_buckets = &__x._M_single_bucket;
+	    }
+	}
+      else if (__x._M_uses_single_bucket())
+	{
+	  __x._M_buckets = _M_buckets;
+	  _M_buckets = &_M_single_bucket;
+	}	
+      else
+	std::swap(_M_buckets, __x._M_buckets);
+
       std::swap(_M_bucket_count, __x._M_bucket_count);
       std::swap(_M_before_begin._M_nxt, __x._M_before_begin._M_nxt);
       std::swap(_M_element_count, __x._M_element_count);
+      std::swap(_M_single_bucket, __x._M_single_bucket);
 
       // Fix buckets containing the _M_before_begin pointers that can't be
       // swapped.
       if (_M_begin())
 	_M_buckets[_M_bucket_index(_M_begin())] = &_M_before_begin;
+
       if (__x._M_begin())
 	__x._M_buckets[__x._M_bucket_index(__x._M_begin())]
 	  = &__x._M_before_begin;
@@ -1212,10 +1281,10 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     __rehash_policy(const _RehashPolicy& __pol)
     {
-      size_type __n_bkt = __pol._M_bkt_for_elements(_M_element_count);
-      __n_bkt = __pol._M_next_bkt(__n_bkt);
-      if (__n_bkt != _M_bucket_count)
-	_M_rehash(__n_bkt, _M_rehash_policy._M_state());
+      auto __do_rehash =
+	__pol._M_need_rehash(_M_bucket_count, _M_element_count, 0);
+      if (__do_rehash.first)
+	_M_rehash(__do_rehash.second, _M_rehash_policy._M_state());
       _M_rehash_policy = __pol;
     }
 
@@ -1230,9 +1299,6 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     find(const key_type& __k)
     {
-      if (__builtin_expect(_M_bucket_count == 0, false))
-	return end();
-
       __hash_code __code = this->_M_hash_code(__k);
       std::size_t __n = _M_bucket_index(__k, __code);
       __node_type* __p = _M_find_node(__n, __k, __code);
@@ -1250,9 +1316,6 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     find(const key_type& __k) const
     {
-      if (__builtin_expect(_M_bucket_count == 0, false))
-	return end();
-      
       __hash_code __code = this->_M_hash_code(__k);
       std::size_t __n = _M_bucket_index(__k, __code);
       __node_type* __p = _M_find_node(__n, __k, __code);
@@ -1270,9 +1333,6 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     count(const key_type& __k) const
     {
-      if (__builtin_expect(_M_bucket_count == 0, false))
-	return 0;
-
       __hash_code __code = this->_M_hash_code(__k);
       std::size_t __n = _M_bucket_index(__k, __code);
       __node_type* __p = _M_bucket_begin(__n);
@@ -1287,7 +1347,7 @@
 	  else if (__result)
 	    // All equivalent values are next to each other, if we
 	    // found a non-equivalent value after an equivalent one it
-	    // means that we won't find any more equivalent values.
+	    // means that we won't find any new equivalent value.
 	    break;
 	  if (!__p->_M_nxt || _M_bucket_index(__p->_M_next()) != __n)
 	    break;
@@ -1311,9 +1371,6 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     equal_range(const key_type& __k)
     {
-      if (__builtin_expect(_M_bucket_count == 0, false))
-	return std::make_pair(end(), end());
-
       __hash_code __code = this->_M_hash_code(__k);
       std::size_t __n = _M_bucket_index(__k, __code);
       __node_type* __p = _M_find_node(__n, __k, __code);
@@ -1347,9 +1404,6 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     equal_range(const key_type& __k) const
     {
-      if (__builtin_expect(_M_bucket_count == 0, false))
-	return std::make_pair(end(), end());
-	
       __hash_code __code = this->_M_hash_code(__k);
       std::size_t __n = _M_bucket_index(__k, __code);
       __node_type* __p = _M_find_node(__n, __k, __code);
@@ -1944,7 +1998,7 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     _M_rehash_aux(size_type __n, std::true_type)
     {
-      __bucket_type* __new_buckets = this->_M_allocate_buckets(__n);
+      __bucket_type* __new_buckets = _M_allocate_buckets(__n);
       __node_type* __p = _M_begin();
       _M_before_begin._M_nxt = nullptr;
       std::size_t __bbegin_bkt = 0;
@@ -1969,8 +2023,7 @@
 	  __p = __next;
 	}
 
-      if (__builtin_expect(_M_bucket_count != 0, true))
-	_M_deallocate_buckets();
+      _M_deallocate_buckets();
       _M_bucket_count = __n;
       _M_buckets = __new_buckets;
     }
@@ -1986,7 +2039,7 @@
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     _M_rehash_aux(size_type __n, std::false_type)
     {
-      __bucket_type* __new_buckets = this->_M_allocate_buckets(__n);
+      __bucket_type* __new_buckets = _M_allocate_buckets(__n);
 
       __node_type* __p = _M_begin();
       _M_before_begin._M_nxt = nullptr;
@@ -2060,8 +2113,7 @@
 	    __new_buckets[__next_bkt] = __prev_p;
 	}
 
-      if (__builtin_expect(_M_bucket_count != 0, true))
-	_M_deallocate_buckets();
+      _M_deallocate_buckets();
       _M_bucket_count = __n;
       _M_buckets = __new_buckets;
     }
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.h
index edfd797..b34dbe6 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.h
@@ -164,6 +164,8 @@
     template<typename _Engine, typename _DInputType>
       struct _Adaptor
       {
+	static_assert(std::is_floating_point<_DInputType>::value,
+		      "template argument not a floating point type");
 
       public:
 	_Adaptor(_Engine& __g)
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.tcc
index 0eda287..8849ee9 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/random.tcc
@@ -3463,6 +3463,9 @@
     _RealType
     generate_canonical(_UniformRandomNumberGenerator& __urng)
     {
+      static_assert(std::is_floating_point<_RealType>::value,
+		    "template argument not a floating point type");
+
       const size_t __b
 	= std::min(static_cast<size_t>(std::numeric_limits<_RealType>::digits),
                    __bits);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_automaton.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_automaton.tcc
index 759b053..6e68fca 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_automaton.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_automaton.tcc
@@ -35,7 +35,7 @@
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #ifdef _GLIBCXX_DEBUG
-  std::ostream&
+  inline std::ostream&
   _State_base::_M_print(std::ostream& ostr) const
   {
     switch (_M_opcode)
@@ -66,7 +66,7 @@
   }
 
   // Prints graphviz dot commands for state.
-  std::ostream&
+  inline std::ostream&
   _State_base::_M_dot(std::ostream& __ostr, _StateIdT __id) const
   {
     switch (_M_opcode)
@@ -197,20 +197,18 @@
 	  // _M_insert_state() never return -1
 	  auto __id = _M_nfa._M_insert_state(__dup);
 	  __m[__u] = __id;
-	  if (__u == _M_end)
-	    continue;
-	  if (__dup._M_next != _S_invalid_state_id && __m[__dup._M_next] == -1)
-	    __stack.push(__dup._M_next);
 	  if (__dup._M_opcode == _S_opcode_alternative
 	      || __dup._M_opcode == _S_opcode_subexpr_lookahead)
 	    if (__dup._M_alt != _S_invalid_state_id && __m[__dup._M_alt] == -1)
 	      __stack.push(__dup._M_alt);
+	  if (__u == _M_end)
+	    continue;
+	  if (__dup._M_next != _S_invalid_state_id && __m[__dup._M_next] == -1)
+	    __stack.push(__dup._M_next);
 	}
-      long __size = static_cast<long>(__m.size());
-      for (long __k = 0; __k < __size; __k++)
+      for (auto __v : __m)
 	{
-	  long __v;
-	  if ((__v = __m[__k]) == -1)
+	  if (__v == -1)
 	    continue;
 	  auto& __ref = _M_nfa[__v];
 	  if (__ref._M_next != _S_invalid_state_id)
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.h
index f5a198f..af76f55 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.h
@@ -369,15 +369,19 @@
 #endif
       }
 
+      // __neg should be true for \D, \S and \W only.
       void
-      _M_add_character_class(const _StringT& __s)
+      _M_add_character_class(const _StringT& __s, bool __neg)
       {
 	auto __mask = _M_traits.lookup_classname(__s.data(),
 						 __s.data() + __s.size(),
 						 __icase);
 	if (__mask == 0)
 	  __throw_regex_error(regex_constants::error_ctype);
-	_M_class_set |= __mask;
+	if (!__neg)
+	  _M_class_set |= __mask;
+	else
+	  _M_neg_class_set.push_back(__mask);
 #ifdef _GLIBCXX_DEBUG
 	_M_is_ready = false;
 #endif
@@ -387,7 +391,7 @@
       _M_make_range(_CharT __l, _CharT __r)
       {
 	_M_range_set.push_back(make_pair(_M_translator._M_transform(__l),
-				      _M_translator._M_transform(__r)));
+					 _M_translator._M_transform(__r)));
 #ifdef _GLIBCXX_DEBUG
 	_M_is_ready = false;
 #endif
@@ -435,6 +439,7 @@
       std::vector<_CharT>                       _M_char_set;
       std::vector<_StringT>                     _M_equiv_set;
       std::vector<pair<_StrTransT, _StrTransT>> _M_range_set;
+      std::vector<_CharClassT>                  _M_neg_class_set;
       _CharClassT                               _M_class_set;
       _TransT                                   _M_translator;
       const _TraitsT&                           _M_traits;
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.tcc
index 128dac1..14e40c0 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_compiler.tcc
@@ -397,7 +397,7 @@
       _GLIBCXX_DEBUG_ASSERT(_M_value.size() == 1);
       _BracketMatcher<_TraitsT, __icase, __collate> __matcher
 	(_M_ctype.is(_CtypeT::upper, _M_value[0]), _M_traits);
-      __matcher._M_add_character_class(_M_value);
+      __matcher._M_add_character_class(_M_value, false);
       __matcher._M_ready();
       _M_stack.push(_StateSeqT(_M_nfa,
 	_M_nfa._M_insert_matcher(std::move(__matcher))));
@@ -428,7 +428,7 @@
       else if (_M_match_token(_ScannerT::_S_token_equiv_class_name))
 	__matcher._M_add_equivalence_class(_M_value);
       else if (_M_match_token(_ScannerT::_S_token_char_class_name))
-	__matcher._M_add_character_class(_M_value);
+	__matcher._M_add_character_class(_M_value, false);
       else if (_M_try_char()) // [a
 	{
 	  auto __ch = _M_value[0];
@@ -451,6 +451,10 @@
 	    }
 	  __matcher._M_add_char(__ch);
 	}
+      else if (_M_match_token(_ScannerT::_S_token_quoted_class))
+	__matcher._M_add_character_class(_M_value,
+					 _M_ctype.is(_CtypeT::upper,
+						     _M_value[0]));
       else
 	__throw_regex_error(regex_constants::error_brack);
     }
@@ -527,6 +531,15 @@
 			     _M_traits.transform_primary(&__ch, &__ch+1))
 		   != _M_equiv_set.end())
 	    __ret = true;
+	  else
+	    {
+	      for (auto& __it : _M_neg_class_set)
+		if (!_M_traits.isctype(__ch, __it))
+		  {
+		    __ret = true;
+		    break;
+		  }
+	    }
 	}
       if (_M_is_non_matching)
 	return !__ret;
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_executor.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_executor.tcc
index 68a5e04..052302b 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_executor.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/regex_executor.tcc
@@ -120,10 +120,10 @@
 	      if (_M_match_queue->empty())
 		break;
 	      _M_visited->assign(_M_visited->size(), false);
-	      auto _M_old_queue = std::move(*_M_match_queue);
-	      for (auto __task : _M_old_queue)
+	      auto __old_queue = std::move(*_M_match_queue);
+	      for (auto& __task : __old_queue)
 		{
-		  _M_cur_results = __task.second;
+		  _M_cur_results = std::move(__task.second);
 		  _M_dfs<__match_mode>(__task.first);
 		}
 	      if (!__match_mode)
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/shared_ptr_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/shared_ptr_base.h
index 536df01..026c597 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/shared_ptr_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/shared_ptr_base.h
@@ -871,7 +871,7 @@
         : _M_ptr(__p), _M_refcount(__p)
 	{
 	  __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-	  static_assert( !is_void<_Tp>::value, "incomplete type" );
+	  static_assert( !is_void<_Tp1>::value, "incomplete type" );
 	  static_assert( sizeof(_Tp1) > 0, "incomplete type" );
 	  __enable_shared_from_this_helper(_M_refcount, __p, __p);
 	}
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_algo.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_algo.h
index 4c6ca8a..104ab86 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_algo.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_algo.h
@@ -199,6 +199,40 @@
   // count_if
   // search
 
+// Local modification: if __google_stl_debug_compare is defined to
+// non-zero value, check sort predicate for strict weak ordering.
+// Google ref b/1731200.
+#if __google_stl_debug_compare
+  template<typename _Compare>
+  struct _CheckedCompare {
+    _Compare _M_compare;
+
+    _CheckedCompare(const _Compare & __comp): _M_compare(__comp) { }
+
+    template <typename _Tp>
+    bool operator()(const _Tp& __x, const _Tp& __y) {
+      if (_M_compare(__x, __x))
+        __throw_runtime_error("strict weak ordering: (__x LT __x) != false");
+      if (_M_compare(__y, __y))
+        __throw_runtime_error("strict weak ordering: (__y LT __y) != false");
+      bool lt = _M_compare(__x, __y);
+      if (lt && _M_compare(__y, __x))
+        __throw_runtime_error("strict weak ordering: ((__x LT __y) && (__y LT __x)) != false");
+      return lt;
+    }
+
+    // Different types; can't perform any checks.
+    template <typename _Tp1, typename _Tp2>
+    bool operator()(const _Tp1& __x, const _Tp2& __y) {
+      return _M_compare(__x, __y);
+    }
+  };
+# define __CheckedCompare(__comp) _CheckedCompare<__typeof__(__comp)>(__comp)
+#else
+# define __CheckedCompare(__comp) __comp
+#endif
+
+
   template<typename _ForwardIterator1, typename _ForwardIterator2,
 	   typename _BinaryPredicate>
     _ForwardIterator1
@@ -1811,7 +1845,7 @@
 
       return std::__partial_sort_copy(__first, __last,
 				      __result_first, __result_last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+	      __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   /// This is a helper function for the sort routine.
@@ -2033,7 +2067,7 @@
 						__val, __comp);
 
       return std::__lower_bound(__first, __last, __val,
-				__gnu_cxx::__ops::__iter_comp_val(__comp));
+		__gnu_cxx::__ops::__iter_comp_val(__CheckedCompare(__comp)));
     }
 
   template<typename _ForwardIterator, typename _Tp, typename _Compare>
@@ -2122,7 +2156,7 @@
 						__val, __comp);
 
       return std::__upper_bound(__first, __last, __val,
-				__gnu_cxx::__ops::__val_comp_iter(__comp));
+		__gnu_cxx::__ops::__val_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _ForwardIterator, typename _Tp,
@@ -2237,8 +2271,8 @@
 						__val, __comp);
 
       return std::__equal_range(__first, __last, __val,
-				__gnu_cxx::__ops::__iter_comp_val(__comp),
-				__gnu_cxx::__ops::__val_comp_iter(__comp));
+		__gnu_cxx::__ops::__iter_comp_val(__CheckedCompare(__comp)),
+		__gnu_cxx::__ops::__val_comp_iter(__CheckedCompare(__comp)));
     }
 
   /**
@@ -2307,7 +2341,7 @@
 
       _ForwardIterator __i
 	= std::__lower_bound(__first, __last, __val,
-			     __gnu_cxx::__ops::__iter_comp_val(__comp));
+	     __gnu_cxx::__ops::__iter_comp_val(__CheckedCompare(__comp)));
       return __i != __last && !bool(__comp(__val, *__i));
     }
 
@@ -2638,7 +2672,7 @@
       __glibcxx_requires_sorted_pred(__middle, __last, __comp);
 
       std::__inplace_merge(__first, __middle, __last,
-			   __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	   __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
 
@@ -2890,7 +2924,7 @@
       __glibcxx_requires_sorted_set_pred(__first2, __last2, __first1, __comp);
 
       return std::__includes(__first1, __last1, __first2, __last2,
-			     __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	     __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   // nth_element
@@ -2997,7 +3031,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       return std::__next_permutation
-	(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _BidirectionalIterator, typename _Compare>
@@ -3095,7 +3129,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       return std::__prev_permutation(__first, __last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+	     __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   // replace
@@ -3282,7 +3316,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       return std::__is_sorted_until(__first, __last,
-				    __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	    __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   /**
@@ -3430,7 +3464,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       return std::__minmax_element(__first, __last,
-				   __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	   __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   // N2722 + DR 915.
@@ -4570,7 +4604,7 @@
       __glibcxx_requires_valid_range(__middle, __last);
 
       std::__partial_sort(__first, __middle, __last,
-			  __gnu_cxx::__ops::__iter_comp_iter(__comp));
+		  __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   /**
@@ -4645,7 +4679,7 @@
 
       std::__introselect(__first, __nth, __last,
 			 std::__lg(__last - __first) * 2,
-			 __gnu_cxx::__ops::__iter_comp_iter(__comp));
+		 __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   /**
@@ -4704,7 +4738,7 @@
 	    typename iterator_traits<_RandomAccessIterator>::value_type>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      std::__sort(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__comp));
+      std::__sort(__first, __last, __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _InputIterator1, typename _InputIterator2,
@@ -4821,7 +4855,7 @@
 
       return _GLIBCXX_STD_A::__merge(__first1, __last1,
 				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+	     __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _RandomAccessIterator, typename _Compare>
@@ -4908,7 +4942,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       _GLIBCXX_STD_A::__stable_sort(__first, __last,
-				    __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	    __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _InputIterator1, typename _InputIterator2,
@@ -5033,7 +5067,7 @@
 
       return _GLIBCXX_STD_A::__set_union(__first1, __last1,
 				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+		 __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _InputIterator1, typename _InputIterator2,
@@ -5145,7 +5179,7 @@
 
       return _GLIBCXX_STD_A::__set_intersection(__first1, __last1,
 				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+		__gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _InputIterator1, typename _InputIterator2,
@@ -5263,7 +5297,7 @@
 
       return _GLIBCXX_STD_A::__set_difference(__first1, __last1,
 				   __first2, __last2, __result,
-				   __gnu_cxx::__ops::__iter_comp_iter(__comp));
+	      __gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _InputIterator1, typename _InputIterator2,
@@ -5390,7 +5424,7 @@
 
       return _GLIBCXX_STD_A::__set_symmetric_difference(__first1, __last1,
 				__first2, __last2, __result,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+		__gnu_cxx::__ops::__iter_comp_iter(__CheckedCompare(__comp)));
     }
 
   template<typename _ForwardIterator, typename _Compare>
@@ -5450,7 +5484,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       return _GLIBCXX_STD_A::__min_element(__first, __last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+		   __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
   template<typename _ForwardIterator, typename _Compare>
@@ -5509,7 +5543,7 @@
       __glibcxx_requires_valid_range(__first, __last);
 
       return _GLIBCXX_STD_A::__max_element(__first, __last,
-				__gnu_cxx::__ops::__iter_comp_iter(__comp));
+	   __gnu_cxx::__ops::__iter_comp_iter(__comp));
     }
 
 _GLIBCXX_END_NAMESPACE_ALGO
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_bvector.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_bvector.h
index 996eb1a..86375cb 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_bvector.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_bvector.h
@@ -471,11 +471,31 @@
 #endif
 
       ~_Bvector_base()
-      { this->_M_deallocate(); }
+      {
+        this->_M_deallocate();
+#if __google_stl_debug_bvector
+        __builtin_memset(this, 0xcd, sizeof(*this));
+#endif
+      }
 
     protected:
       _Bvector_impl _M_impl;
 
+#if __google_stl_debug_bvector
+      bool _M_is_valid() const
+      {
+	return (this->_M_impl._M_start._M_p == 0
+		&& this->_M_impl._M_finish._M_p == 0
+		&& this->_M_impl._M_end_of_storage == 0)
+	  || (this->_M_impl._M_start._M_p <= this->_M_impl._M_finish._M_p
+	      && this->_M_impl._M_finish._M_p <= this->_M_impl._M_end_of_storage
+	      && (this->_M_impl._M_start._M_p < this->_M_impl._M_end_of_storage
+                  || (this->_M_impl._M_start._M_p == this->_M_impl._M_end_of_storage
+                      && this->_M_impl._M_start._M_offset == 0
+                      && this->_M_impl._M_finish._M_offset == 0)));
+      }
+#endif
+
       _Bit_type*
       _M_allocate(size_t __n)
       { return _M_impl.allocate(_S_nword(__n)); }
@@ -631,6 +651,10 @@
     vector&
     operator=(const vector& __x)
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("op=() on corrupt (dangling?) vector");
+#endif
       if (&__x == this)
 	return *this;
       if (__x.size() > capacity())
@@ -647,6 +671,10 @@
     vector&
     operator=(vector&& __x)
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("op=() on corrupt (dangling?) vector");
+#endif
       // NB: DR 1204.
       // NB: DR 675.
       this->clear();
@@ -668,19 +696,35 @@
     // or not the type is an integer.
     void
     assign(size_type __n, const bool& __x)
-    { _M_fill_assign(__n, __x); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("assign() on corrupt (dangling?) vector");
+#endif
+      _M_fill_assign(__n, __x);
+    }
 
 #if __cplusplus >= 201103L
     template<typename _InputIterator,
 	     typename = std::_RequireInputIter<_InputIterator>>
       void
       assign(_InputIterator __first, _InputIterator __last)
-      { _M_assign_dispatch(__first, __last, __false_type()); }
+      {
+#if __google_stl_debug_bvector
+	if (!this->_M_is_valid())
+	  __throw_logic_error("assign() on corrupt (dangling?) vector");
+#endif
+	_M_assign_dispatch(__first, __last, __false_type());
+      }
 #else
     template<typename _InputIterator>
       void
       assign(_InputIterator __first, _InputIterator __last)
       {
+#if __google_stl_debug_bvector
+	if (!this->_M_is_valid())
+	  __throw_logic_error("assign() on corrupt (dangling?) vector");
+#endif
 	typedef typename std::__is_integer<_InputIterator>::__type _Integral;
 	_M_assign_dispatch(__first, __last, _Integral());
       }
@@ -694,19 +738,43 @@
 
     iterator
     begin() _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_start; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("begin() on corrupt (dangling?) vector");
+#endif
+      return this->_M_impl._M_start;
+    }
 
     const_iterator
     begin() const _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_start; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("begin() on corrupt (dangling?) vector");
+#endif
+      return this->_M_impl._M_start;
+    }
 
     iterator
     end() _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_finish; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("end() on corrupt (dangling?) vector");
+#endif
+      return this->_M_impl._M_finish;
+    }
 
     const_iterator
     end() const _GLIBCXX_NOEXCEPT
-    { return this->_M_impl._M_finish; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("end() on corrupt (dangling?) vector");
+#endif
+      return this->_M_impl._M_finish;
+    }
 
     reverse_iterator
     rbegin() _GLIBCXX_NOEXCEPT
@@ -727,11 +795,23 @@
 #if __cplusplus >= 201103L
     const_iterator
     cbegin() const noexcept
-    { return this->_M_impl._M_start; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("cbegin() on corrupt (dangling?) vector");
+#endif
+      return this->_M_impl._M_start;
+    }
 
     const_iterator
     cend() const noexcept
-    { return this->_M_impl._M_finish; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("cend() on corrupt (dangling?) vector");
+#endif
+      return this->_M_impl._M_finish;
+    }
 
     const_reverse_iterator
     crbegin() const noexcept
@@ -749,6 +829,10 @@
     size_type
     max_size() const _GLIBCXX_NOEXCEPT
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("max_size() on corrupt (dangling?) vector");
+#endif
       const size_type __isize =
 	__gnu_cxx::__numeric_traits<difference_type>::__max
 	- int(_S_word_bit) + 1;
@@ -769,6 +853,11 @@
     reference
     operator[](size_type __n)
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("operator[] on corrupt (dangling?) vector");
+      _M_range_check(__n);
+#endif
       return *iterator(this->_M_impl._M_start._M_p
 		       + __n / int(_S_word_bit), __n % int(_S_word_bit));
     }
@@ -776,6 +865,11 @@
     const_reference
     operator[](size_type __n) const
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("operator[] on corrupt (dangling?) vector");
+      _M_range_check(__n);
+#endif
       return *const_iterator(this->_M_impl._M_start._M_p
 			     + __n / int(_S_word_bit), __n % int(_S_word_bit));
     }
@@ -794,11 +888,21 @@
   public:
     reference
     at(size_type __n)
-    { _M_range_check(__n); return (*this)[__n]; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("at() on corrupt (dangling?) vector");
+#endif
+      _M_range_check(__n); return (*this)[__n]; }
 
     const_reference
     at(size_type __n) const
-    { _M_range_check(__n); return (*this)[__n]; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("at() on corrupt (dangling?) vector");
+#endif
+      _M_range_check(__n); return (*this)[__n]; }
 
     void
     reserve(size_type __n)
@@ -811,19 +915,47 @@
 
     reference
     front()
-    { return *begin(); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("front() on corrupt (dangling?) vector");
+      _M_range_check(0);
+#endif
+      return *begin();
+    }
 
     const_reference
     front() const
-    { return *begin(); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("front() on corrupt (dangling?) vector");
+      _M_range_check(0);
+#endif
+      return *begin();
+    }
 
     reference
     back()
-    { return *(end() - 1); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("back() on corrupt (dangling?) vector");
+      _M_range_check(0);
+#endif
+      return *(end() - 1);
+    }
 
     const_reference
     back() const
-    { return *(end() - 1); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("back() on corrupt (dangling?) vector");
+      _M_range_check(0);
+#endif
+      return *(end() - 1);
+    }
 
     // _GLIBCXX_RESOLVE_LIB_DEFECTS
     // DR 464. Suggestion for new member functions in standard containers.
@@ -836,6 +968,10 @@
     void
     push_back(bool __x)
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("push_back() on corrupt (dangling?) vector");
+#endif
       if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_of_storage)
         *this->_M_impl._M_finish++ = __x;
       else
@@ -845,6 +981,10 @@
     void
     swap(vector& __x)
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid() || !__x._M_is_valid())
+	__throw_logic_error("swap() on corrupt (dangling?) vector");
+#endif
       std::swap(this->_M_impl._M_start, __x._M_impl._M_start);
       std::swap(this->_M_impl._M_finish, __x._M_impl._M_finish);
       std::swap(this->_M_impl._M_end_of_storage, 
@@ -872,6 +1012,12 @@
     insert(iterator __position, const bool& __x = bool())
 #endif
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("insert() on corrupt (dangling?) vector");
+      if (__position < this->begin() || __position > this->end())
+	__throw_logic_error("insert() at invalid position");
+#endif
       const difference_type __n = __position - begin();
       if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_of_storage
 	  && __position == end())
@@ -888,6 +1034,12 @@
       insert(const_iterator __position,
 	     _InputIterator __first, _InputIterator __last)
       {
+#if __google_stl_debug_bvector
+	if (!this->_M_is_valid())
+	  __throw_logic_error("insert() on corrupt (dangling?) vector");
+	if (__position < this->begin() || __position > this->end())
+	  __throw_logic_error("insert() at invalid position");
+#endif
 	difference_type __offset = __position - cbegin();
 	_M_insert_dispatch(__position._M_const_cast(),
 			   __first, __last, __false_type());
@@ -899,6 +1051,12 @@
       insert(iterator __position,
 	     _InputIterator __first, _InputIterator __last)
       {
+#if __google_stl_debug_bvector
+	if (!this->_M_is_valid())
+	  __throw_logic_error("insert() on corrupt (dangling?) vector");
+	if (__position < this->begin() || __position > this->end())
+	  __throw_logic_error("insert() at invalid position");
+#endif
 	typedef typename std::__is_integer<_InputIterator>::__type _Integral;
 	_M_insert_dispatch(__position, __first, __last, _Integral());
       }
@@ -908,6 +1066,12 @@
     iterator
     insert(const_iterator __position, size_type __n, const bool& __x)
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("insert() on corrupt (dangling?) vector");
+      if (__position < this->begin() || __position > this->end())
+	__throw_logic_error("insert() at invalid position");
+#endif
       difference_type __offset = __position - cbegin();
       _M_fill_insert(__position._M_const_cast(), __n, __x);
       return begin() + __offset;
@@ -915,7 +1079,15 @@
 #else
     void
     insert(iterator __position, size_type __n, const bool& __x)
-    { _M_fill_insert(__position, __n, __x); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("insert() on corrupt (dangling?) vector");
+      if (__position < this->begin() || __position > this->end())
+	__throw_logic_error("insert() at invalid position");
+#endif
+      _M_fill_insert(__position, __n, __x);
+    }
 #endif
 
 #if __cplusplus >= 201103L
@@ -926,7 +1098,14 @@
 
     void
     pop_back()
-    { --this->_M_impl._M_finish; }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("pop_back() on corrupt (dangling?) vector");
+      _M_range_check(0);
+#endif
+      --this->_M_impl._M_finish;
+    }
 
     iterator
 #if __cplusplus >= 201103L
@@ -934,7 +1113,15 @@
 #else
     erase(iterator __position)
 #endif
-    { return _M_erase(__position._M_const_cast()); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("erase() on corrupt (dangling?) vector");
+      if (__position < this->begin() || __position >= this->end())
+	__throw_logic_error("erase() at invalid position");
+#endif
+      return _M_erase(__position._M_const_cast());
+    }
 
     iterator
 #if __cplusplus >= 201103L
@@ -942,7 +1129,15 @@
 #else
     erase(iterator __first, iterator __last)
 #endif
-    { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
+    { 
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("erase() on corrupt (dangling?) vector");
+      if (__first < this->begin() || __first > __last || __last > this->end())
+	__throw_logic_error("erase() invalid range");
+#endif
+      return _M_erase(__first._M_const_cast(), __last._M_const_cast());
+    }
 
     void
     resize(size_type __new_size, bool __x = bool())
@@ -956,12 +1151,22 @@
 #if __cplusplus >= 201103L
     void
     shrink_to_fit()
-    { _M_shrink_to_fit(); }
+    {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("shrink_to_fit() on corrupt (dangling?) vector");
+#endif
+      _M_shrink_to_fit();
+    }
 #endif
 
     void
     flip() _GLIBCXX_NOEXCEPT
     {
+#if __google_stl_debug_bvector
+      if (!this->_M_is_valid())
+	__throw_logic_error("flip() on corrupt (dangling?) vector");
+#endif
       for (_Bit_type * __p = this->_M_impl._M_start._M_p;
 	   __p != this->_M_impl._M_end_of_storage; ++__p)
         *__p = ~*__p;
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_deque.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_deque.h
index add8742..40ff8d6 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_deque.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_deque.h
@@ -1247,7 +1247,12 @@
        */
       reference
       operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_start[difference_type(__n)]; }
+      {
+#if __google_stl_debug_deque
+	_M_range_check(__n);
+#endif
+	return this->_M_impl._M_start[difference_type(__n)];
+      }
 
       /**
        *  @brief Subscript access to the data contained in the %deque.
@@ -1262,7 +1267,12 @@
        */
       const_reference
       operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      { return this->_M_impl._M_start[difference_type(__n)]; }
+      {
+#if __google_stl_debug_deque
+	_M_range_check(__n);
+#endif
+	return this->_M_impl._M_start[difference_type(__n)];
+      }
 
     protected:
       /// Safety check used only from at().
@@ -1319,7 +1329,12 @@
        */
       reference
       front() _GLIBCXX_NOEXCEPT
-      { return *begin(); }
+      {
+#if __google_stl_debug_deque
+	if (empty()) __throw_logic_error("front() on empty deque");
+#endif
+	return *begin();
+      }
 
       /**
        *  Returns a read-only (constant) reference to the data at the first
@@ -1327,7 +1342,12 @@
        */
       const_reference
       front() const _GLIBCXX_NOEXCEPT
-      { return *begin(); }
+      {
+#if __google_stl_debug_deque
+	if (empty()) __throw_logic_error("front() on empty deque");
+#endif
+	return *begin();
+      }
 
       /**
        *  Returns a read/write reference to the data at the last element of the
@@ -1336,6 +1356,9 @@
       reference
       back() _GLIBCXX_NOEXCEPT
       {
+#if __google_stl_debug_deque
+	if (empty()) __throw_logic_error("back() on empty deque");
+#endif
 	iterator __tmp = end();
 	--__tmp;
 	return *__tmp;
@@ -1348,6 +1371,9 @@
       const_reference
       back() const _GLIBCXX_NOEXCEPT
       {
+#if __google_stl_debug_deque
+	if (empty()) __throw_logic_error("back() on empty deque");
+#endif
 	const_iterator __tmp = end();
 	--__tmp;
 	return *__tmp;
@@ -1428,6 +1454,9 @@
       void
       pop_front() _GLIBCXX_NOEXCEPT
       {
+#if __google_stl_debug_deque
+	if (empty()) __throw_logic_error("pop_front() on empty deque");
+#endif
 	if (this->_M_impl._M_start._M_cur
 	    != this->_M_impl._M_start._M_last - 1)
 	  {
@@ -1449,6 +1478,9 @@
       void
       pop_back() _GLIBCXX_NOEXCEPT
       {
+#if __google_stl_debug_deque
+	if (empty()) __throw_logic_error("pop_back() on empty deque");
+#endif
 	if (this->_M_impl._M_finish._M_cur
 	    != this->_M_impl._M_finish._M_first)
 	  {
@@ -1540,6 +1572,10 @@
       iterator
       insert(const_iterator __position, size_type __n, const value_type& __x)
       {
+#if __google_stl_debug_deque
+	if (__position < this->begin() || __position > this->end())
+	  __throw_logic_error("insert() at invalid position");
+#endif
 	difference_type __offset = __position - cbegin();
 	_M_fill_insert(__position._M_const_cast(), __n, __x);
 	return begin() + __offset;
@@ -1556,7 +1592,13 @@
        */
       void
       insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
+      {
+#if __google_stl_debug_deque
+	if (__position < this->begin() || __position > this->end())
+	  __throw_logic_error("insert() at invalid position");
+#endif
+	_M_fill_insert(__position, __n, __x);
+      }
 #endif
 
 #if __cplusplus >= 201103L
@@ -1577,6 +1619,10 @@
         insert(const_iterator __position, _InputIterator __first,
 	       _InputIterator __last)
         {
+#if __google_stl_debug_vector
+	  if (__position < this->begin() || __position > this->end())
+	    __throw_out_of_range(__N("insert() at invalid position"));
+#endif
 	  difference_type __offset = __position - cbegin();
 	  _M_insert_dispatch(__position._M_const_cast(),
 			     __first, __last, __false_type());
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_iterator.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_iterator.h
index 1d2a524..aa3581e 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_iterator.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_iterator.h
@@ -736,21 +736,6 @@
 		      _Container>::__type>& __i) _GLIBCXX_NOEXCEPT
         : _M_current(__i.base()) { }
 
-#if __cplusplus >= 201103L
-      __normal_iterator<typename _Container::pointer, _Container>
-      _M_const_cast() const noexcept
-      {
-	using _PTraits = std::pointer_traits<typename _Container::pointer>;
-	return __normal_iterator<typename _Container::pointer, _Container>
-	  (_PTraits::pointer_to(const_cast<typename _PTraits::element_type&>
-				(*_M_current)));
-      }
-#else
-      __normal_iterator
-      _M_const_cast() const
-      { return *this; }
-#endif
-
       // Forward iterator requirements
       reference
       operator*() const _GLIBCXX_NOEXCEPT
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_tree.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_tree.h
index 4bc3c60..61156db 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_tree.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_tree.h
@@ -486,7 +486,47 @@
 	  }	    
 	};
 
+      // Local modification: if __google_stl_debug_rbtree is defined to
+      // non-zero value, check sort predicate for strict weak ordering.
+      // Google ref b/1731200.
+#if __google_stl_debug_rbtree
+      template<typename _KeyCompare>
+      struct _CheckedCompare {
+        _KeyCompare _M_key_compare;
+
+        _CheckedCompare(): _M_key_compare() { }
+        _CheckedCompare(const _KeyCompare & __comp): _M_key_compare(__comp) { }
+
+	// Template arg required to avoid duplicating code in the two op()
+	// operators below.  User-provided _M_key_compare may not be const,
+	// but needs to be callable from our const op().
+	// Google ref. b/1731200.
+	template <typename _KeyCompareT>
+        static bool _M_compare_with(_KeyCompareT& __comp, const _Key& __x, const _Key& __y) {
+          if (__comp(__x, __x))
+            __throw_runtime_error("strict weak ordering: (__x LT __x) != false");
+          if (__comp(__y, __y))
+            __throw_runtime_error("strict weak ordering: (__y LT __y) != false");
+          bool lt = __comp(__x, __y);
+          if (lt && __comp(__y, __x))
+            __throw_runtime_error("strict weak ordering: ((__x LT __y) && (__y LT __x)) != false");
+          return lt;
+        }
+        bool operator()(const _Key& __x, const _Key& __y) const {
+	  return _M_compare_with(_M_key_compare, __x, __y);
+        }
+
+        bool operator()(const _Key& __x, const _Key& __y) {
+	  return _M_compare_with(_M_key_compare, __x, __y);
+        }
+
+        operator _KeyCompare() const { return _M_key_compare; }
+      };
+
+      _Rb_tree_impl<_CheckedCompare<_Compare> > _M_impl;
+#else
       _Rb_tree_impl<_Compare> _M_impl;
+#endif
 
     protected:
       _Base_ptr&
@@ -526,11 +566,11 @@
 
       _Link_type
       _M_end() _GLIBCXX_NOEXCEPT
-      { return static_cast<_Link_type>(&this->_M_impl._M_header); }
+      { return reinterpret_cast<_Link_type>(&this->_M_impl._M_header); }
 
       _Const_Link_type
       _M_end() const _GLIBCXX_NOEXCEPT
-      { return static_cast<_Const_Link_type>(&this->_M_impl._M_header); }
+      { return reinterpret_cast<_Const_Link_type>(&this->_M_impl._M_header); }
 
       static const_reference
       _S_value(_Const_Link_type __x)
@@ -1073,6 +1113,7 @@
     _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
     _M_move_assign(_Rb_tree& __x)
     {
+      _M_impl._M_key_compare = __x._M_impl._M_key_compare;
       if (_Alloc_traits::_S_propagate_on_move_assign()
 	  || _Alloc_traits::_S_always_equal()
 	  || _M_get_Node_allocator() == __x._M_get_Node_allocator())
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h
index 7e52fde..f7c7359 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h
@@ -63,6 +63,20 @@
 #include <initializer_list>
 #endif
 
+#ifdef _GLIBCXX_ADDRESS_SANITIZER_ANNOTATIONS
+extern "C" void
+__sanitizer_annotate_contiguous_container(const void *, const void *,
+					  const void *, const void *);
+#else
+// When sanitizer annotataions are off, avoid bazillion of no-op
+// functions that blow up debug binary size.
+#define __sanitizer_vector_annotate_new()
+#define __sanitizer_vector_annotate_delete()
+#define __sanitizer_vector_annotate_increase(a)
+#define __sanitizer_vector_annotate_shrink(a)
+#endif  // _GLIBCXX_ADDRESS_SANITIZER_ANNOTATIONS
+
+
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
@@ -158,7 +172,12 @@
 
       ~_Vector_base() _GLIBCXX_NOEXCEPT
       { _M_deallocate(this->_M_impl._M_start, this->_M_impl._M_end_of_storage
-		      - this->_M_impl._M_start); }
+		      - this->_M_impl._M_start);
+#if __google_stl_debug_dangling_vector
+        this->_M_impl._M_start = 0;
+        this->_M_impl._M_finish = reinterpret_cast<_Tp*>(~0UL);
+#endif
+      }
 
     public:
       _Vector_impl _M_impl;
@@ -243,6 +262,31 @@
       using _Base::_M_impl;
       using _Base::_M_get_Tp_allocator;
 
+      bool _M_is_valid() const
+      {
+        if (this->_M_impl._M_end_of_storage == 0
+	    && this->_M_impl._M_start == 0
+	    && this->_M_impl._M_finish == 0)
+	  return true;
+
+	if (this->_M_impl._M_start <= this->_M_impl._M_finish
+	    && this->_M_impl._M_finish <= this->_M_impl._M_end_of_storage)
+	  {
+	    if (this->_M_impl._M_start < this->_M_impl._M_end_of_storage)
+	      return true;
+	    else if (this->_M_impl._M_start == this->_M_impl._M_end_of_storage
+		     && this->_M_impl._M_start == this->_M_impl._M_finish)
+	      {
+		pointer _0xcdcd;
+
+		__builtin_memset(&_0xcdcd, 0xcd, sizeof(_0xcdcd));
+		return this->_M_impl._M_finish != _0xcdcd;
+	      }
+	  }
+
+	return false;
+      }
+
     public:
       // [23.2.4.1] construct/copy/destroy
       // (assign() and get_allocator() are also listed in this section)
@@ -545,7 +589,13 @@
        */
       iterator
       begin() _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_impl._M_start); }
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("begin() on corrupt (dangling?) vector");
+#endif
+	return iterator(this->_M_impl._M_start);
+      }
 
       /**
        *  Returns a read-only (constant) iterator that points to the
@@ -554,7 +604,13 @@
        */
       const_iterator
       begin() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_impl._M_start); }
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("begin() on corrupt (dangling?) vector");
+#endif
+	return const_iterator(this->_M_impl._M_start);
+      }
 
       /**
        *  Returns a read/write iterator that points one past the last
@@ -563,7 +619,13 @@
        */
       iterator
       end() _GLIBCXX_NOEXCEPT
-      { return iterator(this->_M_impl._M_finish); }
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("end() on corrupt (dangling?) vector");
+#endif
+	return iterator(this->_M_impl._M_finish);
+      }
 
       /**
        *  Returns a read-only (constant) iterator that points one past
@@ -572,7 +634,13 @@
        */
       const_iterator
       end() const _GLIBCXX_NOEXCEPT
-      { return const_iterator(this->_M_impl._M_finish); }
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("end() on corrupt (dangling?) vector");
+#endif
+	return const_iterator(this->_M_impl._M_finish);
+      }
 
       /**
        *  Returns a read/write reverse iterator that points to the
@@ -652,7 +720,13 @@
       /**  Returns the number of elements in the %vector.  */
       size_type
       size() const _GLIBCXX_NOEXCEPT
-      { return size_type(this->_M_impl._M_finish - this->_M_impl._M_start); }
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("size() on corrupt (dangling?) vector");
+#endif
+	return size_type(this->_M_impl._M_finish - this->_M_impl._M_start);
+      }
 
       /**  Returns the size() of the largest possible %vector.  */
       size_type
@@ -732,7 +806,12 @@
        */
       size_type
       capacity() const _GLIBCXX_NOEXCEPT
-      { return size_type(this->_M_impl._M_end_of_storage
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("capacity() on corrupt (dangling?) vector");
+#endif
+	return size_type(this->_M_impl._M_end_of_storage
 			 - this->_M_impl._M_start); }
 
       /**
@@ -774,10 +853,18 @@
        *  Note that data access with this operator is unchecked and
        *  out_of_range lookups are not defined. (For checked lookups
        *  see at().)
+       *
+       *  Local modification: range checks are performed if
+       *  __google_stl_debug_vector is defined to non-zero.
        */
       reference
       operator[](size_type __n) _GLIBCXX_NOEXCEPT
-      { return *(this->_M_impl._M_start + __n); }
+      {
+#if __google_stl_debug_vector
+	_M_range_check(__n);
+#endif
+	return *(this->_M_impl._M_start + __n);
+      }
 
       /**
        *  @brief  Subscript access to the data contained in the %vector.
@@ -789,10 +876,18 @@
        *  Note that data access with this operator is unchecked and
        *  out_of_range lookups are not defined. (For checked lookups
        *  see at().)
+       *
+       *  Local modification: range checks are performed if
+       *  __google_stl_debug_vector is defined to non-zero.
        */
       const_reference
       operator[](size_type __n) const _GLIBCXX_NOEXCEPT
-      { return *(this->_M_impl._M_start + __n); }
+      {
+#if __google_stl_debug_vector
+	_M_range_check(__n);
+#endif
+	return *(this->_M_impl._M_start + __n);
+      }
 
     protected:
       /// Safety check used only from at().
@@ -849,7 +944,12 @@
        */
       reference
       front() _GLIBCXX_NOEXCEPT
-      { return *begin(); }
+      {
+#if __google_stl_debug_vector
+        if (empty()) __throw_logic_error("front() on empty vector");
+#endif
+        return *begin();
+      }
 
       /**
        *  Returns a read-only (constant) reference to the data at the first
@@ -857,7 +957,12 @@
        */
       const_reference
       front() const _GLIBCXX_NOEXCEPT
-      { return *begin(); }
+      {
+#if __google_stl_debug_vector
+        if (empty()) __throw_logic_error("front() on empty vector");
+#endif
+        return *begin();
+      }
 
       /**
        *  Returns a read/write reference to the data at the last
@@ -865,7 +970,12 @@
        */
       reference
       back() _GLIBCXX_NOEXCEPT
-      { return *(end() - 1); }
+      {
+#if __google_stl_debug_vector
+        if (empty()) __throw_logic_error("back() on empty vector");
+#endif
+        return *(end() - 1);
+      }
       
       /**
        *  Returns a read-only (constant) reference to the data at the
@@ -873,7 +983,12 @@
        */
       const_reference
       back() const _GLIBCXX_NOEXCEPT
-      { return *(end() - 1); }
+      {
+#if __google_stl_debug_vector
+        if (empty()) __throw_logic_error("back() on empty vector");
+#endif
+        return *(end() - 1);
+      }
 
       // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // DR 464. Suggestion for new member functions in standard containers.
@@ -888,7 +1003,12 @@
       pointer
 #endif
       data() _GLIBCXX_NOEXCEPT
-      { return _M_data_ptr(this->_M_impl._M_start); }
+      {
+#if __google_stl_debug_vector
+        if (empty()) return 0;
+#endif
+        return _M_data_ptr(this->_M_impl._M_start); 
+      }
 
 #if __cplusplus >= 201103L
       const _Tp*
@@ -896,7 +1016,12 @@
       const_pointer
 #endif
       data() const _GLIBCXX_NOEXCEPT
-      { return _M_data_ptr(this->_M_impl._M_start); }
+      {
+#if __google_stl_debug_vector
+        if (empty()) return 0;
+#endif
+        return _M_data_ptr(this->_M_impl._M_start);
+      }
 
       // [23.2.4.3] modifiers
       /**
@@ -914,6 +1039,7 @@
       {
 	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
 	  {
+	    __sanitizer_vector_annotate_increase(1);
 	    _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
 	                             __x);
 	    ++this->_M_impl._M_finish;
@@ -948,8 +1074,14 @@
       void
       pop_back() _GLIBCXX_NOEXCEPT
       {
+#if __google_stl_debug_vector
+	if (this->empty())
+	  __throw_logic_error(__N("pop_back() on empty vector"));
+#endif
+	size_type __old_size = size();
 	--this->_M_impl._M_finish;
 	_Alloc_traits::destroy(this->_M_impl, this->_M_impl._M_finish);
+	__sanitizer_vector_annotate_shrink(__old_size);
       }
 
 #if __cplusplus >= 201103L
@@ -1050,8 +1182,12 @@
       iterator
       insert(const_iterator __position, size_type __n, const value_type& __x)
       {
+#if __google_stl_debug_vector
+	if (__position < this->begin() || __position > this->end())
+	  __throw_out_of_range(__N("insert() at invalid position"));
+#endif
 	difference_type __offset = __position - cbegin();
-	_M_fill_insert(__position._M_const_cast(), __n, __x);
+	_M_fill_insert(begin() + __offset, __n, __x);
 	return begin() + __offset;
       }
 #else
@@ -1070,7 +1206,13 @@
        */
       void
       insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
+      {
+#if __google_stl_debug_vector
+	if (__position < this->begin() || __position > this->end())
+	  __throw_out_of_range(__N("insert() at invalid position"));
+#endif
+	_M_fill_insert(__position, __n, __x);
+      }
 #endif
 
 #if __cplusplus >= 201103L
@@ -1095,8 +1237,12 @@
         insert(const_iterator __position, _InputIterator __first,
 	       _InputIterator __last)
         {
+#if __google_stl_debug_vector
+	  if (__position < this->begin() || __position > this->end())
+	    __throw_out_of_range(__N("insert() at invalid position"));
+#endif
 	  difference_type __offset = __position - cbegin();
-	  _M_insert_dispatch(__position._M_const_cast(),
+	  _M_insert_dispatch(begin() + __offset,
 			     __first, __last, __false_type());
 	  return begin() + __offset;
 	}
@@ -1120,6 +1266,10 @@
         insert(iterator __position, _InputIterator __first,
 	       _InputIterator __last)
         {
+#if __google_stl_debug_vector
+	  if (__position < this->begin() || __position > this->end())
+	    __throw_out_of_range(__N("insert() at invalid position"));
+#endif
 	  // Check whether it's an integral type.  If so, it's not an iterator.
 	  typedef typename std::__is_integer<_InputIterator>::__type _Integral;
 	  _M_insert_dispatch(__position, __first, __last, _Integral());
@@ -1144,10 +1294,11 @@
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __position)
+      { return _M_erase(begin() + (__position - cbegin())); }
 #else
       erase(iterator __position)
+      { return _M_erase(__position); }
 #endif
-      { return _M_erase(__position._M_const_cast()); }
 
       /**
        *  @brief  Remove a range of elements.
@@ -1170,10 +1321,15 @@
       iterator
 #if __cplusplus >= 201103L
       erase(const_iterator __first, const_iterator __last)
+      {
+	const auto __beg = begin();
+	const auto __cbeg = cbegin();
+	return _M_erase(__beg + (__first - __cbeg), __beg + (__last - __cbeg));
+      }
 #else
       erase(iterator __first, iterator __last)
+      { return _M_erase(__first, __last); }
 #endif
-      { return _M_erase(__first._M_const_cast(), __last._M_const_cast()); }
 
       /**
        *  @brief  Swaps data with another %vector.
@@ -1190,6 +1346,10 @@
       noexcept(_Alloc_traits::_S_nothrow_swap())
 #endif
       {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid() || !__x._M_is_valid())
+          __throw_logic_error("swap() on corrupt (dangling?) vector");
+#endif
 	this->_M_impl._M_swap_data(__x._M_impl);
 	_Alloc_traits::_S_on_swap(_M_get_Tp_allocator(),
 	                          __x._M_get_Tp_allocator());
@@ -1203,7 +1363,13 @@
        */
       void
       clear() _GLIBCXX_NOEXCEPT
-      { _M_erase_at_end(this->_M_impl._M_start); }
+      {
+#if __google_stl_debug_dangling_vector
+        if (!this->_M_is_valid())
+          __throw_logic_error("clear() on corrupt (dangling?) vector");
+#endif
+	_M_erase_at_end(this->_M_impl._M_start);
+      }
 
     protected:
       /**
@@ -1429,8 +1595,10 @@
       void
       _M_erase_at_end(pointer __pos) _GLIBCXX_NOEXCEPT
       {
+	size_type __old_size = size();
 	std::_Destroy(__pos, this->_M_impl._M_finish, _M_get_Tp_allocator());
 	this->_M_impl._M_finish = __pos;
+	__sanitizer_vector_annotate_shrink(__old_size);
       }
 
       iterator
@@ -1487,6 +1655,72 @@
 	_M_data_ptr(_Ptr __ptr) const
 	{ return __ptr; }
 #endif
+
+#ifdef _GLIBCXX_ADDRESS_SANITIZER_ANNOTATIONS
+    private:
+      template<class T, class U>
+      struct __is_same_allocator {
+	static void __annotate_contiguous_container(pointer __beg,
+						    pointer __end,
+						    pointer __old_mid,
+						    pointer __new_mid) { }
+      };
+      // The following functions are no-ops outside of AddressSanitizer mode.
+      // We call annotatations only for the default Allocator because
+      // other allocators may not meet the AddressSanitizer alignment
+      // constraints.
+      // See the documentation for __sanitizer_annotate_contiguous_container
+      // for more details.
+      template <class T> struct __is_same_allocator<T, T> {
+	static void __annotate_contiguous_container(pointer __beg,
+						    pointer __end,
+						    pointer __old_mid,
+						    pointer __new_mid) {
+	  if (__beg)
+	    __sanitizer_annotate_contiguous_container(__beg,
+						      __end,
+						      __old_mid,
+						      __new_mid);
+	}
+      };
+
+      void __annotate_contiguous_container(pointer __beg,
+					   pointer __end,
+					   pointer __old_mid,
+					   pointer __new_mid)
+      {
+	__is_same_allocator<_Alloc, std::allocator<_Tp> >::
+	  __annotate_contiguous_container(__beg, __end, __old_mid, __new_mid);
+      }
+      void __sanitizer_vector_annotate_new()
+      {
+	__annotate_contiguous_container(_M_impl._M_start,
+					_M_impl._M_end_of_storage,
+					_M_impl._M_end_of_storage,
+					_M_impl._M_finish);
+      }
+      void __sanitizer_vector_annotate_delete()
+      {
+	__annotate_contiguous_container(_M_impl._M_start,
+					_M_impl._M_end_of_storage,
+					_M_impl._M_finish,
+					_M_impl._M_end_of_storage);
+      }
+      void __sanitizer_vector_annotate_increase(size_type __n)
+      {
+	__annotate_contiguous_container(_M_impl._M_start,
+					_M_impl._M_end_of_storage,
+					_M_impl._M_finish,
+					_M_impl._M_finish + __n);
+      }
+      void __sanitizer_vector_annotate_shrink(size_type __old_size)
+      {
+	__annotate_contiguous_container(_M_impl._M_start,
+					_M_impl._M_end_of_storage,
+					_M_impl._M_start + __old_size,
+					_M_impl._M_finish);
+      }
+#endif	// _GLIBCXX_ADDRESS_SANITIZER_ANNOTATIONS
     };
 
 
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/vector.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/vector.tcc
index 1eff514..015ccd6 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/vector.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/vector.tcc
@@ -73,6 +73,7 @@
 	  pointer __tmp = _M_allocate_and_copy(__n,
 	    _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(this->_M_impl._M_start),
 	    _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(this->_M_impl._M_finish));
+	  __sanitizer_vector_annotate_delete();
 	  std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 			_M_get_Tp_allocator());
 	  _M_deallocate(this->_M_impl._M_start,
@@ -81,6 +82,7 @@
 	  this->_M_impl._M_start = __tmp;
 	  this->_M_impl._M_finish = __tmp + __old_size;
 	  this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
+	  __sanitizer_vector_annotate_new();
 	}
     }
 
@@ -93,6 +95,7 @@
       {
 	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
 	  {
+	    __sanitizer_vector_annotate_increase(1);
 	    _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
 				     std::forward<_Args>(__args)...);
 	    ++this->_M_impl._M_finish;
@@ -111,24 +114,32 @@
     insert(iterator __position, const value_type& __x)
 #endif
     {
+#if __google_stl_debug_vector
+      if (__position < this->begin() || __position > this->end())
+	__throw_out_of_range(__N("insert() at invalid position"));
+#endif
       const size_type __n = __position - begin();
       if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage
 	  && __position == end())
 	{
+	  __sanitizer_vector_annotate_increase(1);
 	  _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish, __x);
 	  ++this->_M_impl._M_finish;
 	}
       else
 	{
 #if __cplusplus >= 201103L
+	  const auto __pos = begin() + (__position - cbegin());
 	  if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
 	    {
 	      _Tp __x_copy = __x;
-	      _M_insert_aux(__position._M_const_cast(), std::move(__x_copy));
+	      _M_insert_aux(__pos, std::move(__x_copy));
 	    }
 	  else
+	    _M_insert_aux(__pos, __x);
+#else
+	    _M_insert_aux(__position, __x);
 #endif
-	    _M_insert_aux(__position._M_const_cast(), __x);
 	}
       return iterator(this->_M_impl._M_start + __n);
     }
@@ -138,10 +149,15 @@
     vector<_Tp, _Alloc>::
     _M_erase(iterator __position)
     {
+#if __google_stl_debug_vector
+      if (__position < this->begin() || __position >= this->end())
+	__throw_out_of_range(__N("erase() at invalid position"));
+#endif
       if (__position + 1 != end())
 	_GLIBCXX_MOVE3(__position + 1, end(), __position);
       --this->_M_impl._M_finish;
       _Alloc_traits::destroy(this->_M_impl, this->_M_impl._M_finish);
+      __sanitizer_vector_annotate_shrink(size() + 1);
       return __position;
     }
 
@@ -150,6 +166,10 @@
     vector<_Tp, _Alloc>::
     _M_erase(iterator __first, iterator __last)
     {
+#if __google_stl_debug_vector
+      if (__first < this->begin() || __first > __last || __last > this->end())
+	__throw_out_of_range("erase() invalid range");
+#endif
       if (__first != __last)
 	{
 	  if (__last != end())
@@ -164,8 +184,13 @@
     vector<_Tp, _Alloc>::
     operator=(const vector<_Tp, _Alloc>& __x)
     {
+#if __google_stl_debug_dangling_vector
+      if (!this->_M_is_valid() || !__x._M_is_valid())
+	__throw_logic_error("operator=() on corrupt (dangling?) vector");
+#endif
       if (&__x != this)
 	{
+	  __sanitizer_vector_annotate_delete();
 #if __cplusplus >= 201103L
 	  if (_Alloc_traits::_S_propagate_on_copy_assign())
 	    {
@@ -213,6 +238,7 @@
 					  _M_get_Tp_allocator());
 	    }
 	  this->_M_impl._M_finish = this->_M_impl._M_start + __xlen;
+	  __sanitizer_vector_annotate_new();
 	}
       return *this;
     }
@@ -224,11 +250,13 @@
     {
       if (__n > capacity())
 	{
+	  __sanitizer_vector_annotate_delete();
 	  vector __tmp(__n, __val, _M_get_Tp_allocator());
 	  __tmp.swap(*this);
 	}
       else if (__n > size())
 	{
+	  __sanitizer_vector_annotate_increase(__n - size());
 	  std::fill(begin(), end(), __val);
 	  std::__uninitialized_fill_n_a(this->_M_impl._M_finish,
 					__n - size(), __val,
@@ -268,6 +296,7 @@
 	if (__len > capacity())
 	  {
 	    pointer __tmp(_M_allocate_and_copy(__len, __first, __last));
+	    __sanitizer_vector_annotate_delete();
 	    std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 			  _M_get_Tp_allocator());
 	    _M_deallocate(this->_M_impl._M_start,
@@ -276,11 +305,13 @@
 	    this->_M_impl._M_start = __tmp;
 	    this->_M_impl._M_finish = this->_M_impl._M_start + __len;
 	    this->_M_impl._M_end_of_storage = this->_M_impl._M_finish;
+	    __sanitizer_vector_annotate_new();
 	  }
 	else if (size() >= __len)
 	  _M_erase_at_end(std::copy(__first, __last, this->_M_impl._M_start));
 	else
 	  {
+	    __sanitizer_vector_annotate_increase(__len - size());
 	    _ForwardIterator __mid = __first;
 	    std::advance(__mid, size());
 	    std::copy(__first, __mid, this->_M_impl._M_start);
@@ -298,16 +329,21 @@
       vector<_Tp, _Alloc>::
       emplace(const_iterator __position, _Args&&... __args)
       {
+#if __google_stl_debug_vector
+	if (__position < this->begin() || __position > this->end())
+	  __throw_out_of_range(__N("emplace() at invalid position"));
+#endif
 	const size_type __n = __position - begin();
 	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage
 	    && __position == end())
 	  {
+	    __sanitizer_vector_annotate_increase(1);
 	    _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
 				     std::forward<_Args>(__args)...);
 	    ++this->_M_impl._M_finish;
 	  }
 	else
-	  _M_insert_aux(__position._M_const_cast(),
+	  _M_insert_aux(begin() + (__position - cbegin()),
 			std::forward<_Args>(__args)...);
 	return iterator(this->_M_impl._M_start + __n);
       }
@@ -326,6 +362,7 @@
     {
       if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
 	{
+	  __sanitizer_vector_annotate_increase(1);
 	  _Alloc_traits::construct(this->_M_impl, this->_M_impl._M_finish,
 			           _GLIBCXX_MOVE(*(this->_M_impl._M_finish
 				                   - 1)));
@@ -386,6 +423,7 @@
 	      _M_deallocate(__new_start, __len);
 	      __throw_exception_again;
 	    }
+	  __sanitizer_vector_annotate_delete();
 	  std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 			_M_get_Tp_allocator());
 	  _M_deallocate(this->_M_impl._M_start,
@@ -394,6 +432,7 @@
 	  this->_M_impl._M_start = __new_start;
 	  this->_M_impl._M_finish = __new_finish;
 	  this->_M_impl._M_end_of_storage = __new_start + __len;
+	  __sanitizer_vector_annotate_new();
 	}
     }
 
@@ -430,6 +469,7 @@
 	    _M_deallocate(__new_start, __len);
 	    __throw_exception_again;
 	  }
+	__sanitizer_vector_annotate_delete();
 	std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 		      _M_get_Tp_allocator());
 	_M_deallocate(this->_M_impl._M_start,
@@ -438,6 +478,7 @@
 	this->_M_impl._M_start = __new_start;
 	this->_M_impl._M_finish = __new_finish;
 	this->_M_impl._M_end_of_storage = __new_start + __len;
+	__sanitizer_vector_annotate_new();
       }
 #endif
 
@@ -451,6 +492,7 @@
 	  if (size_type(this->_M_impl._M_end_of_storage
 			- this->_M_impl._M_finish) >= __n)
 	    {
+	      __sanitizer_vector_annotate_increase(__n);
 	      value_type __x_copy = __x;
 	      const size_type __elems_after = end() - __position;
 	      pointer __old_finish(this->_M_impl._M_finish);
@@ -519,6 +561,7 @@
 		  _M_deallocate(__new_start, __len);
 		  __throw_exception_again;
 		}
+	      __sanitizer_vector_annotate_delete();
 	      std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 			    _M_get_Tp_allocator());
 	      _M_deallocate(this->_M_impl._M_start,
@@ -527,6 +570,7 @@
 	      this->_M_impl._M_start = __new_start;
 	      this->_M_impl._M_finish = __new_finish;
 	      this->_M_impl._M_end_of_storage = __new_start + __len;
+	      __sanitizer_vector_annotate_new();
 	    }
 	}
     }
@@ -542,6 +586,7 @@
 	  if (size_type(this->_M_impl._M_end_of_storage
 			- this->_M_impl._M_finish) >= __n)
 	    {
+	      __sanitizer_vector_annotate_increase(__n);
 	      std::__uninitialized_default_n_a(this->_M_impl._M_finish,
 					       __n, _M_get_Tp_allocator());
 	      this->_M_impl._M_finish += __n;
@@ -570,6 +615,7 @@
 		  _M_deallocate(__new_start, __len);
 		  __throw_exception_again;
 		}
+	      __sanitizer_vector_annotate_delete();
 	      std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 			    _M_get_Tp_allocator());
 	      _M_deallocate(this->_M_impl._M_start,
@@ -578,6 +624,7 @@
 	      this->_M_impl._M_start = __new_start;
 	      this->_M_impl._M_finish = __new_finish;
 	      this->_M_impl._M_end_of_storage = __new_start + __len;
+	      __sanitizer_vector_annotate_new();
 	    }
 	}
     }
@@ -589,7 +636,10 @@
     {
       if (capacity() == size())
 	return false;
-      return std::__shrink_to_fit_aux<vector>::_S_do_it(*this);
+      __sanitizer_vector_annotate_delete();
+      bool __res = std::__shrink_to_fit_aux<vector>::_S_do_it(*this);
+      __sanitizer_vector_annotate_new();
+      return __res;
     }
 #endif
 
@@ -620,6 +670,7 @@
 	    if (size_type(this->_M_impl._M_end_of_storage
 			  - this->_M_impl._M_finish) >= __n)
 	      {
+		__sanitizer_vector_annotate_increase(__n);
 		const size_type __elems_after = end() - __position;
 		pointer __old_finish(this->_M_impl._M_finish);
 		if (__elems_after > __n)
@@ -677,6 +728,7 @@
 		    _M_deallocate(__new_start, __len);
 		    __throw_exception_again;
 		  }
+		__sanitizer_vector_annotate_delete();
 		std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish,
 			      _M_get_Tp_allocator());
 		_M_deallocate(this->_M_impl._M_start,
@@ -685,6 +737,7 @@
 		this->_M_impl._M_start = __new_start;
 		this->_M_impl._M_finish = __new_finish;
 		this->_M_impl._M_end_of_storage = __new_start + __len;
+		__sanitizer_vector_annotate_new();
 	      }
 	  }
       }
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/condition_variable b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/condition_variable
index fc111dd..921cb83 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/condition_variable
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/condition_variable
@@ -189,7 +189,14 @@
 	~_Unlock() noexcept(false)
 	{
 	  if (uncaught_exception())
-	    __try { _M_lock.lock(); } __catch(...) { }
+	    {
+	      __try
+	      { _M_lock.lock(); }
+	      __catch(const __cxxabiv1::__forced_unwind&)
+	      { __throw_exception_again; }
+	      __catch(...)
+	      { }
+	    }
 	  else
 	    _M_lock.lock();
 	}
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/debug/vector b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/debug/vector
index 2e9cd65..f7f54ee 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/debug/vector
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/debug/vector
@@ -602,7 +602,7 @@
 	  }
 	else
 #if __cplusplus >= 201103L
-	  return iterator(__first.base()._M_const_cast(), this);
+	  return begin() + (__first.base() - cbegin().base());
 #else
 	  return __first;
 #endif
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/optional b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/optional
index 5f2d93f..2a3f29d 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/optional
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/optional
@@ -736,12 +736,12 @@
   template<typename _Tp>
     constexpr bool
     operator!=(const optional<_Tp>& __lhs, _Tp const& __rhs)
-    { return !__lhs || *__lhs != __rhs; }
+    { return !__lhs || !(*__lhs == __rhs); }
 
   template<typename _Tp>
     constexpr bool
     operator!=(const _Tp& __lhs, const optional<_Tp>& __rhs)
-    { return !__rhs || __lhs != *__rhs; }
+    { return !__rhs || !(__lhs == *__rhs); }
 
   template<typename _Tp>
     constexpr bool
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view
index bebeb6b..49f46af 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view
@@ -39,7 +39,6 @@
 # include <bits/c++14_warning.h>
 #else
 
-#include <debug/debug.h>
 #include <string>
 #include <limits>
 
@@ -66,18 +65,10 @@
    *    _CharT*    _M_str
    *    size_t     _M_len
    *  @endcode
-   *
-   *  A basic_string_view represents an empty string with a static constexpr
-   *  length one string:
-   *
-   *  @code
-   *    static constexpr value_type _S_empty_str[1]{0};
-   *  @endcode
    */
-  template<typename _CharT, typename _Traits = char_traits<_CharT>>
+  template<typename _CharT, typename _Traits = std::char_traits<_CharT>>
     class basic_string_view
     {
-
     public:
 
       // types
@@ -99,7 +90,7 @@
 
       constexpr
       basic_string_view() noexcept
-      : _M_len{0}, _M_str{_S_empty_str}
+      : _M_len{0}, _M_str{nullptr}
       { }
 
       constexpr basic_string_view(const basic_string_view&) noexcept = default;
@@ -112,12 +103,12 @@
 
       constexpr basic_string_view(const _CharT* __str)
       : _M_len{__str == nullptr ? 0 : traits_type::length(__str)},
-	_M_str{__str == nullptr ? _S_empty_str : __str}
+	_M_str{__str}
       { }
 
       constexpr basic_string_view(const _CharT* __str, size_type __len)
-      : _M_len{__str == nullptr ? 0 :__len},
-        _M_str{__str == nullptr ? _S_empty_str : __str}
+      : _M_len{__len},
+        _M_str{__str}
       { }
 
       basic_string_view&
@@ -143,19 +134,19 @@
 
       const_reverse_iterator
       rbegin() const noexcept
-      { return std::reverse_iterator<const_iterator>(this->end()); }
+      { return const_reverse_iterator(this->end()); }
 
       const_reverse_iterator
       rend() const noexcept
-      { return std::reverse_iterator<const_iterator>(this->begin()); }
+      { return const_reverse_iterator(this->begin()); }
 
       const_reverse_iterator
       crbegin() const noexcept
-      { return std::reverse_iterator<const_iterator>(this->end()); }
+      { return const_reverse_iterator(this->end()); }
 
       const_reverse_iterator
       crend() const noexcept
-      { return std::reverse_iterator<const_iterator>(this->begin()); }
+      { return const_reverse_iterator(this->begin()); }
 
       // [string.view.capacity], capacity
 
@@ -169,8 +160,10 @@
 
       constexpr size_type
       max_size() const noexcept
-      { return ((npos - sizeof(size_type) - sizeof(void*))
-		/ sizeof(value_type) / 4); }
+      {
+	return (npos - sizeof(size_type) - sizeof(void*))
+		/ sizeof(value_type) / 4;
+      }
 
       constexpr bool
       empty() const noexcept
@@ -195,7 +188,7 @@
 					     "(which is %zu) >= this->size() "
 					     "(which is %zu)"),
 					 __pos, this->size()),
-		_S_empty_str[0]);
+		*this->_M_str);
       }
 
       constexpr const _CharT&
@@ -219,11 +212,12 @@
       { return this->_M_str; }
 
       // [string.view.modifiers], modifiers:
+
       void
       clear() noexcept
       {
 	this->_M_len = 0;
-	this->_M_str = _S_empty_str;
+	this->_M_str = nullptr;
       }
 
       void
@@ -251,8 +245,14 @@
       template<typename _Allocator>
         explicit operator basic_string<_CharT, _Traits, _Allocator>() const
         {
-	  return basic_string<_CharT, _Traits, _Allocator>
-					(this->_M_len, this->_M_str);
+	  return { this->_M_str, this->_M_len };
+	}
+
+      template<typename _Allocator = std::allocator<_CharT>>
+	basic_string<_CharT, _Traits, _Allocator>
+	to_string(const _Allocator& __alloc = _Allocator()) const
+	{
+	  return { this->_M_str, this->_M_len, __alloc };
 	}
 
       size_type
@@ -329,7 +329,7 @@
       find(_CharT __c, size_type __pos=0) const noexcept;
 
       size_type
-      find(const _CharT* __str, size_type __pos, size_type __n) const;
+      find(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
 
       size_type
       find(const _CharT* __str, size_type __pos=0) const noexcept
@@ -343,7 +343,7 @@
       rfind(_CharT __c, size_type __pos = npos) const noexcept;
 
       size_type
-      rfind(const _CharT* __str, size_type __pos, size_type __n) const;
+      rfind(const _CharT* __str, size_type __pos, size_type __n) const noexcept;
 
       size_type
       rfind(const _CharT* __str, size_type __pos = npos) const noexcept
@@ -431,8 +431,6 @@
 	     : static_cast<int>(difference_type{__n1 - __n2});
       }
 
-      static constexpr value_type _S_empty_str[1]{};
-
       size_t	    _M_len;
       const _CharT* _M_str;
     };
@@ -456,131 +454,119 @@
   }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator==(basic_string_view<_CharT, _Traits> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) == 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator==(basic_string_view<_CharT, _Traits> __x,
                __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
     { return __x.compare(__y) == 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator==(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) == 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator!=(basic_string_view<_CharT, _Traits> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return !(__x == __y); }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator!=(basic_string_view<_CharT, _Traits> __x,
                __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
     { return !(__x == __y); }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator!=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return !(__x == __y); }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator< (basic_string_view<_CharT, _Traits> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) < 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator< (basic_string_view<_CharT, _Traits> __x,
                __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
     { return __x.compare(__y) < 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator< (__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) < 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator> (basic_string_view<_CharT, _Traits> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) > 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator> (basic_string_view<_CharT, _Traits> __x,
                __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
     { return __x.compare(__y) > 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator> (__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) > 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator<=(basic_string_view<_CharT, _Traits> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) <= 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator<=(basic_string_view<_CharT, _Traits> __x,
                __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
     { return __x.compare(__y) <= 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator<=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) <= 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator>=(basic_string_view<_CharT, _Traits> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) >= 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator>=(basic_string_view<_CharT, _Traits> __x,
                __detail::__idt<basic_string_view<_CharT, _Traits>> __y) noexcept
     { return __x.compare(__y) >= 0; }
 
   template<typename _CharT, typename _Traits>
-    bool
+    inline bool
     operator>=(__detail::__idt<basic_string_view<_CharT, _Traits>> __x,
                basic_string_view<_CharT, _Traits> __y) noexcept
     { return __x.compare(__y) >= 0; }
 
-  // [string.view.comparison], sufficient additional overloads of comparison functions
-
-  // [string.view.nonmem], other non-member basic_string_view functions
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-           typename _Allocator = allocator<_CharT>>
-    basic_string<_CharT, _Traits, _Allocator>
-    to_string(basic_string_view<_CharT, _Traits> __str,
-	      const _Allocator& __alloc = _Allocator())
-    {
-      return basic_string<_CharT, _Traits, _Allocator>
-			(__str.begin(), __str.end(), __alloc);
-    }
-
+  // [string.view.io], Inserters and extractors
   template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-      operator<<(basic_ostream<_CharT, _Traits>& __os,
-                 basic_string_view<_CharT,_Traits> __str)
-      { return __ostream_insert(__os, __str.data(), __str.size()); }
+    inline basic_ostream<_CharT, _Traits>&
+    operator<<(basic_ostream<_CharT, _Traits>& __os,
+	       basic_string_view<_CharT,_Traits> __str)
+    { return __ostream_insert(__os, __str.data(), __str.size()); }
 
 
   // basic_string_view typedef names
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view.tcc
index 1af3a4d..4456266 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/experimental/string_view.tcc
@@ -47,10 +47,6 @@
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<typename _CharT, typename _Traits>
-    constexpr _CharT
-    basic_string_view<_CharT, _Traits>::_S_empty_str[1];
-
-  template<typename _CharT, typename _Traits>
     typename basic_string_view<_CharT, _Traits>::size_type
     basic_string_view<_CharT, _Traits>::
     find(const _CharT* __str, size_type __pos, size_type __n) const noexcept
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/new_allocator.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/new_allocator.h
index 996a219..ee9333e 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/new_allocator.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/new_allocator.h
@@ -104,10 +104,17 @@
 	return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp)));
       }
 
+#ifdef __GXX_DELETE_WITH_SIZE__
+      // __p is not permitted to be a null pointer.
+      void
+      deallocate(pointer __p, size_type __t)
+      { ::operator delete(__p, __t * sizeof(_Tp)); }
+#else
       // __p is not permitted to be a null pointer.
       void
       deallocate(pointer __p, size_type)
       { ::operator delete(__p); }
+#endif
 
       size_type
       max_size() const _GLIBCXX_USE_NOEXCEPT
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
index d97b432..7ada365 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
@@ -55,7 +55,7 @@
 	     class Cmp_Fn,
 	     template<typename Node_CItr,
 		      class Node_Itr,
-		      class Cmp_Fn,
+		      class _Cmp_Fn,
 		      typename _Alloc>
 	     class Node_Update,
 	     class Node,
@@ -161,7 +161,7 @@
 	     class Cmp_Fn,
 	     template<typename Node_CItr,
 		      class Node_Itr,
-		      class Cmp_Fn,
+		      class _Cmp_Fn,
 		      typename _Alloc>
 	     class Node_Update,
 	     class Node,
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/random.tcc b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/random.tcc
index dd7a14a..fec7f86 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/random.tcc
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/random.tcc
@@ -1314,7 +1314,7 @@
       operator()(_UniformRandomNumberGenerator& __urng,
 		 const param_type& __param)
       {
-	std::__detail::_Adaptor<_UniformRandomNumberGenerator, result_type>
+	std::__detail::_Adaptor<_UniformRandomNumberGenerator, double>
 	  __aurng(__urng);
 
 	result_type __a = __param.successful_size();
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/rope b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/rope
index df3d4bb..147b335 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/rope
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/rope
@@ -1544,7 +1544,7 @@
       typedef typename _Base::allocator_type allocator_type;
       using _Base::_M_tree_ptr;
       using _Base::get_allocator;
-      using _Base::_M_get_allocator;      
+      using _Base::_M_get_allocator;
       typedef __GC_CONST _CharT* _Cstrptr;
       
       static _CharT _S_empty_c_str[1];
@@ -1876,8 +1876,9 @@
 	   const allocator_type& __a = allocator_type())
       : _Base(__a)
       {
-	this->_M_tree_ptr = (0 == __len) ?
-	  0 : _S_new_RopeFunction(__fn, __len, __delete_fn, __a);
+	this->_M_tree_ptr = (0 == __len)
+	  ? 0
+	  : _S_new_RopeFunction(__fn, __len, __delete_fn, _M_get_allocator());
       }
 
       rope(const rope& __x, const allocator_type& __a = allocator_type())
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/sso_string_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/sso_string_base.h
index 80c88ae..3ad4e95 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/sso_string_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/sso_string_base.h
@@ -85,6 +85,13 @@
       {
 	if (!_M_is_local())
 	  _M_destroy(_M_allocated_capacity);
+#if __google_stl_debug_dangling_string
+	else {
+          // Wipe local storage for destructed string with 0xCD.
+          // This mimics what DebugAllocation does to free()d memory.
+          __builtin_memset(_M_local_data, 0xcd, sizeof(_M_local_data));
+        }
+#endif
       }
 
       void
@@ -168,15 +175,29 @@
       _M_leak() { }
 
       void
-      _M_set_length(size_type __n)
+      _M_set_length_no_wipe(size_type __n)
       {
 	_M_length(__n);
 	traits_type::assign(_M_data()[__n], _CharT());
       }
 
+      void
+      _M_set_length(size_type __n)
+      {
+#if __google_stl_debug_dangling_string
+	if (__n + 1 < _M_length())
+	  {
+	    // Wipe the storage with 0xCD.
+	    // Also wipes the old NUL terminator.
+	    __builtin_memset(_M_data() + __n + 1, 0xcd, _M_length() - __n);
+	  }
+#endif
+	  _M_set_length_no_wipe(__n);
+      }
+
       __sso_string_base()
       : _M_dataplus(_M_local_data)
-      { _M_set_length(0); }
+      { _M_set_length_no_wipe(0); }
 
       __sso_string_base(const _Alloc& __a);
 
@@ -193,7 +214,12 @@
 			  const _Alloc& __a);
 
       ~__sso_string_base()
-      { _M_dispose(); }
+      {
+          _M_dispose();
+#ifdef __google_stl_debug_dangling_string
+          __builtin_memset(this, 0xcd, sizeof(*this));
+#endif
+      }
 
       _CharT_alloc_type&
       _M_get_allocator()
@@ -335,7 +361,7 @@
     __sso_string_base<_CharT, _Traits, _Alloc>::
     __sso_string_base(const _Alloc& __a)
     : _M_dataplus(__a, _M_local_data)
-    { _M_set_length(0); }
+    { _M_set_length_no_wipe(0); }
 
   template<typename _CharT, typename _Traits, typename _Alloc>
     __sso_string_base<_CharT, _Traits, _Alloc>::
@@ -361,9 +387,9 @@
 	  _M_capacity(__rcs._M_allocated_capacity);
 	}
 
-      _M_set_length(__rcs._M_length());
+      _M_set_length_no_wipe(__rcs._M_length());
       __rcs._M_data(__rcs._M_local_data);
-      __rcs._M_set_length(0);
+      __rcs._M_set_length_no_wipe(0);
     }
 #endif
 
@@ -425,7 +451,7 @@
 	    __throw_exception_again;
 	  }
 
-	_M_set_length(__len);
+	_M_set_length_no_wipe(__len);
       }
 
   template<typename _CharT, typename _Traits, typename _Alloc>
@@ -457,7 +483,7 @@
 	    __throw_exception_again;
 	  }
 
-	_M_set_length(__dnew);
+	_M_set_length_no_wipe(__dnew);
       }
 
   template<typename _CharT, typename _Traits, typename _Alloc>
@@ -474,7 +500,7 @@
       if (__n)
 	this->_S_assign(_M_data(), __n, __c);
 
-      _M_set_length(__n);
+      _M_set_length_no_wipe(__n);
     }
 
   template<typename _CharT, typename _Traits, typename _Alloc>
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/vstring.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/vstring.h
index 749d370..45d8079 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/vstring.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/ext/vstring.h
@@ -39,6 +39,21 @@
 #include <ext/rc_string_base.h>
 #include <ext/sso_string_base.h>
 
+#if __google_stl_debug_string && !defined(_GLIBCXX_DEBUG)
+# undef _GLIBCXX_DEBUG_ASSERT
+# undef _GLIBCXX_DEBUG_PEDASSERT
+// Perform additional checks (but only in this file).
+# define _GLIBCXX_DEBUG_ASSERT(_Condition)                             \
+  if (! (_Condition)) {                                                \
+    char buf[512];                                                     \
+    __builtin_snprintf(buf, sizeof(buf),                               \
+                      "%s:%d: %s: Assertion '%s' failed.\n",           \
+                      __FILE__, __LINE__, __func__, # _Condition);     \
+    std::__throw_runtime_error(buf);                                   \
+  }
+# define _GLIBCXX_DEBUG_PEDASSERT(_Condition) _GLIBCXX_DEBUG_ASSERT(_Condition)
+#endif
+
 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -536,7 +551,15 @@
       const_reference
       operator[] (size_type __pos) const _GLIBCXX_NOEXCEPT
       {
+#if __google_stl_debug_string && !defined(_GLIBCXX_DEBUG)
+	if (__pos > this->size())
+	  std::__throw_out_of_range_fmt(__N("__versa_string::operator[]: __pos "
+					    "(which is %zu) > this->size() "
+					    "(which is %zu)"),
+					__pos, this->size());
+#else
 	_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
+#endif
 	return this->_M_data()[__pos];
       }
 
@@ -555,7 +578,15 @@
       {
         // Allow pos == size() both in C++98 mode, as v3 extension,
 	// and in C++11 mode.
+#if __google_stl_debug_string && !defined(_GLIBCXX_DEBUG)
+	if (__pos > this->size())
+	  std::__throw_out_of_range_fmt(__N("__versa_string::operator[]: __pos "
+					    "(which is %zu) > this->size() "
+					    "(which is %zu)"),
+					__pos, this->size());
+#else
 	_GLIBCXX_DEBUG_ASSERT(__pos <= this->size());
+#endif
         // In pedantic mode be strict in C++98 mode.
 	_GLIBCXX_DEBUG_PEDASSERT(__cplusplus >= 201103L
 				 || __pos < this->size());
@@ -2960,4 +2991,12 @@
 
 #include "vstring.tcc" 
 
+#if __google_stl_debug_string && !defined(_GLIBCXX_DEBUG)
+// Undo our defines, so they don't affect anything else.
+# undef _GLIBCXX_DEBUG_ASSERT
+# undef _GLIBCXX_DEBUG_PEDASSERT
+# define _GLIBCXX_DEBUG_ASSERT(_Condition)
+# define _GLIBCXX_DEBUG_PEDASSERT(_Condition)
+#endif
+
 #endif /* _VSTRING_H */
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/functional b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/functional
index 5a987d9..0e80fa3 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/functional
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/functional
@@ -2149,8 +2149,15 @@
 	using _Invoke = decltype(__callable_functor(std::declval<_Functor&>())
 				 (std::declval<_ArgTypes>()...) );
 
+      // Used so the return type convertibility checks aren't done when
+      // performing overload resolution for copy construction/assignment.
+      template<typename _Tp>
+	using _NotSelf = __not_<is_same<_Tp, function>>;
+
       template<typename _Functor>
-	using _Callable = __check_func_return_type<_Invoke<_Functor>, _Res>;
+	using _Callable
+	  = __and_<_NotSelf<_Functor>,
+		   __check_func_return_type<_Invoke<_Functor>, _Res>>;
 
       template<typename _Cond, typename _Tp>
 	using _Requires = typename enable_if<_Cond::value, _Tp>::type;
@@ -2291,7 +2298,7 @@
        *  reference_wrapper<F>, this function will not throw.
        */
       template<typename _Functor>
-	_Requires<_Callable<_Functor>, function&>
+	_Requires<_Callable<typename decay<_Functor>::type>, function&>
 	operator=(_Functor&& __f)
 	{
 	  function(std::forward<_Functor>(__f)).swap(*this);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/future b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/future
index 717ce71..d446b9d 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/future
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/future
@@ -365,12 +365,14 @@
       void
       _M_set_result(function<_Ptr_type()> __res, bool __ignore_failure = false)
       {
-        bool __set = __ignore_failure;
+        bool __set = false;
         // all calls to this function are serialized,
         // side-effects of invoking __res only happen once
         call_once(_M_once, &_State_baseV2::_M_do_set, this, ref(__res),
             ref(__set));
-        if (!__set)
+	if (__set)
+	  _M_cond.notify_all();
+	else if (!__ignore_failure)
           __throw_future_error(int(future_errc::promise_already_satisfied));
       }
 
@@ -485,7 +487,6 @@
           lock_guard<mutex> __lock(_M_mutex);
           _M_result.swap(__res);
         }
-        _M_cond.notify_all();
         __set = true;
       }
 
@@ -495,6 +496,7 @@
       virtual void _M_complete_async() { }
 
       // Return true if state contains a deferred function.
+      // Caller must own _M_mutex.
       virtual bool _M_has_deferred() const { return false; }
     };
 
@@ -1007,22 +1009,25 @@
       void
       set_value(const _Res& __r)
       {
+	auto __future = _M_future;
         auto __setter = _State::__setter(this, __r);
-        _M_future->_M_set_result(std::move(__setter));
+        __future->_M_set_result(std::move(__setter));
       }
 
       void
       set_value(_Res&& __r)
       {
+	auto __future = _M_future;
         auto __setter = _State::__setter(this, std::move(__r));
-        _M_future->_M_set_result(std::move(__setter));
+        __future->_M_set_result(std::move(__setter));
       }
 
       void
       set_exception(exception_ptr __p)
       {
+	auto __future = _M_future;
         auto __setter = _State::__setter(__p, this);
-        _M_future->_M_set_result(std::move(__setter));
+        __future->_M_set_result(std::move(__setter));
       }
     };
 
@@ -1105,15 +1110,17 @@
       void
       set_value(_Res& __r)
       {
+	auto __future = _M_future;
         auto __setter = _State::__setter(this, __r);
-        _M_future->_M_set_result(std::move(__setter));
+        __future->_M_set_result(std::move(__setter));
       }
 
       void
       set_exception(exception_ptr __p)
       {
+	auto __future = _M_future;
         auto __setter = _State::__setter(__p, this);
-        _M_future->_M_set_result(std::move(__setter));
+        __future->_M_set_result(std::move(__setter));
       }
     };
 
@@ -1190,8 +1197,9 @@
       void
       set_exception(exception_ptr __p)
       {
+	auto __future = _M_future;
         auto __setter = _State::__setter(__p, this);
-        _M_future->_M_set_result(std::move(__setter));
+        __future->_M_set_result(std::move(__setter));
       }
     };
 
@@ -1217,8 +1225,9 @@
   inline void
   promise<void>::set_value()
   {
+    auto __future = _M_future;
     auto __setter = _State::__setter(this);
-    _M_future->_M_set_result(std::move(__setter));
+    __future->_M_set_result(std::move(__setter));
   }
 
 
@@ -1231,6 +1240,10 @@
 	  {
 	    _M_result->_M_set(_M_fn());
 	  }
+	__catch(const __cxxabiv1::__forced_unwind&)
+	  {
+	    __throw_exception_again; // will cause broken_promise
+	  }
 	__catch(...)
 	  {
 	    _M_result->_M_error = current_exception();
@@ -1250,6 +1263,10 @@
 	  {
 	    _M_fn();
 	  }
+	__catch(const __cxxabiv1::__forced_unwind&)
+	  {
+	    __throw_exception_again; // will cause broken_promise
+	  }
 	__catch(...)
 	  {
 	    _M_result->_M_error = current_exception();
@@ -1510,7 +1527,17 @@
       : _M_result(new _Result<_Res>()), _M_fn(std::move(__fn))
       {
 	_M_thread = std::thread{ [this] {
-	  _M_set_result(_S_task_setter(_M_result, _M_fn));
+	    __try
+	      {
+		_M_set_result(_S_task_setter(_M_result, _M_fn));
+	      }
+	    __catch (const __cxxabiv1::__forced_unwind&)
+	      {
+		// make the shared state ready on thread cancellation
+		if (static_cast<bool>(_M_result))
+		  this->_M_break_promise(std::move(_M_result));
+		__throw_exception_again;
+	      }
         } };
       }
 
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iomanip b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iomanip
index 73822db..cc6f60c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iomanip
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iomanip
@@ -41,6 +41,9 @@
 
 #if __cplusplus >= 201103L
 #include <locale>
+#if __cplusplus > 201103L
+#include <sstream> // used in quoted.
+#endif
 #endif
 
 namespace std _GLIBCXX_VISIBILITY(default)
@@ -342,7 +345,6 @@
 
     /**
      * @brief Struct for delimited strings.
-     *        The left and right delimiters can be different.
      */
     template<typename _String, typename _CharT>
       struct _Quoted_string
@@ -364,45 +366,51 @@
       };
 
     /**
-     * @brief Inserter for delimited strings.
-     *        The left and right delimiters can be different.
+     * @brief Inserter for quoted strings.
+     *
+     *  _GLIBCXX_RESOLVE_LIB_DEFECTS
+     *  DR 2344 quoted()'s interaction with padding is unclear
      */
     template<typename _CharT, typename _Traits>
       auto&
       operator<<(std::basic_ostream<_CharT, _Traits>& __os,
 		 const _Quoted_string<const _CharT*, _CharT>& __str)
       {
-	__os << __str._M_delim;
+	std::basic_ostringstream<_CharT, _Traits> __ostr;
+	__ostr << __str._M_delim;
 	for (const _CharT* __c = __str._M_string; *__c; ++__c)
 	  {
 	    if (*__c == __str._M_delim || *__c == __str._M_escape)
-	      __os << __str._M_escape;
-	    __os << *__c;
+	      __ostr << __str._M_escape;
+	    __ostr << *__c;
 	  }
-	__os << __str._M_delim;
+	__ostr << __str._M_delim;
 
-	return __os;
+	return __os << __ostr.str();
       }
 
     /**
-     * @brief Inserter for delimited strings.
-     *        The left and right delimiters can be different.
+     * @brief Inserter for quoted strings.
+     *
+     *  _GLIBCXX_RESOLVE_LIB_DEFECTS
+     *  DR 2344 quoted()'s interaction with padding is unclear
      */
     template<typename _CharT, typename _Traits, typename _String>
       auto&
       operator<<(std::basic_ostream<_CharT, _Traits>& __os,
 		 const _Quoted_string<_String, _CharT>& __str)
       {
-	__os << __str._M_delim;
+	std::basic_ostringstream<_CharT, _Traits> __ostr;
+	__ostr << __str._M_delim;
 	for (auto& __c : __str._M_string)
 	  {
 	    if (__c == __str._M_delim || __c == __str._M_escape)
-	      __os << __str._M_escape;
-	    __os << __c;
+	      __ostr << __str._M_escape;
+	    __ostr << __c;
 	  }
-	__os << __str._M_delim;
+	__ostr << __str._M_delim;
 
-	return __os;
+	return __os << __ostr.str();
       }
 
     /**
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iostream b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iostream
index 85d2b95..5c10869 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iostream
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/iostream
@@ -48,13 +48,13 @@
    *
    *  The &lt;iostream&gt; header declares the eight <em>standard stream
    *  objects</em>.  For other declarations, see
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt11ch24.html
+   *  http://gcc.gnu.org/onlinedocs/libstdc++/manual/io.html
    *  and the @link iosfwd I/O forward declarations @endlink
    *
    *  They are required by default to cooperate with the global C
    *  library's @c FILE streams, and to be available during program
-   *  startup and termination. For more information, see the HOWTO
-   *  linked to above.
+   *  startup and termination. For more information, see the section of the
+   *  manual linked to above.
   */
   //@{
   extern istream cin;		/// Linked to standard input
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/mutex b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/mutex
index 0b481d6..8e9dd27 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/mutex
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/mutex
@@ -44,6 +44,7 @@
 #include <bits/functexcept.h>
 #include <bits/gthr.h>
 #include <bits/move.h> // for std::swap
+#include <bits/cxxabi_forced.h>
 
 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
 
@@ -649,6 +650,8 @@
       auto __locks = std::tie(__l1, __l2, __l3...);
       __try
       { __try_lock_impl<0>::__do_try_lock(__locks, __idx); }
+      __catch(const __cxxabiv1::__forced_unwind&)
+      { __throw_exception_again; }
       __catch(...)
       { }
       return __idx;
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/new b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/new
index a65a0b8..229bcea 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/new
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/new
@@ -131,6 +131,8 @@
   __attribute__((__externally_visible__));
 void operator delete(void*) _GLIBCXX_USE_NOEXCEPT
   __attribute__((__externally_visible__));
+void operator delete(void*, std::size_t) _GLIBCXX_USE_NOEXCEPT
+  __attribute__((__externally_visible__));
 void operator delete[](void*) _GLIBCXX_USE_NOEXCEPT
   __attribute__((__externally_visible__));
 void* operator new(std::size_t, const std::nothrow_t&) _GLIBCXX_USE_NOEXCEPT
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/tuple b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/tuple
index 92ecdb9..103c99e 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/tuple
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/tuple
@@ -710,27 +710,28 @@
       add_cv<typename tuple_element<__i, _Tp>::type>::type type;
     };
 
+#if __cplusplus > 201103L
+  template<std::size_t __i, typename _Tp>
+    using tuple_element_t = typename tuple_element<__i, _Tp>::type;
+#endif
+
   /// Finds the size of a given tuple type.
   template<typename _Tp>
     struct tuple_size;
 
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 2313. tuple_size should always derive from integral_constant<size_t, N>
   template<typename _Tp>
     struct tuple_size<const _Tp>
-    : public integral_constant<
-             typename remove_cv<decltype(tuple_size<_Tp>::value)>::type,
-             tuple_size<_Tp>::value> { };
+    : public integral_constant<size_t, tuple_size<_Tp>::value> { };
 
   template<typename _Tp>
     struct tuple_size<volatile _Tp>
-    : public integral_constant<
-             typename remove_cv<decltype(tuple_size<_Tp>::value)>::type,
-             tuple_size<_Tp>::value> { };
+    : public integral_constant<size_t, tuple_size<_Tp>::value> { };
 
   template<typename _Tp>
     struct tuple_size<const volatile _Tp>
-    : public integral_constant<
-             typename remove_cv<decltype(tuple_size<_Tp>::value)>::type,
-             tuple_size<_Tp>::value> { };
+    : public integral_constant<size_t, tuple_size<_Tp>::value> { };
 
   /// class tuple_size
   template<typename... _Elements>
@@ -747,23 +748,23 @@
     __get_helper(const _Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
     { return _Tuple_impl<__i, _Head, _Tail...>::_M_head(__t); }
 
-  // Return a reference (const reference, rvalue reference) to the ith element
-  // of a tuple.  Any const or non-const ref elements are returned with their
-  // original type.
+  /// Return a reference to the ith element of a tuple.
   template<std::size_t __i, typename... _Elements>
     constexpr typename __add_ref<
                       typename tuple_element<__i, tuple<_Elements...>>::type
                     >::type
     get(tuple<_Elements...>& __t) noexcept
-    { return __get_helper<__i>(__t); }
+    { return std::__get_helper<__i>(__t); }
 
+  /// Return a const reference to the ith element of a const tuple.
   template<std::size_t __i, typename... _Elements>
     constexpr typename __add_c_ref<
                       typename tuple_element<__i, tuple<_Elements...>>::type
                     >::type
     get(const tuple<_Elements...>& __t) noexcept
-    { return __get_helper<__i>(__t); }
+    { return std::__get_helper<__i>(__t); }
 
+  /// Return an rvalue reference to the ith element of a tuple rvalue.
   template<std::size_t __i, typename... _Elements>
     constexpr typename __add_r_ref<
                       typename tuple_element<__i, tuple<_Elements...>>::type
@@ -783,22 +784,26 @@
     __get_helper2(const _Tuple_impl<__i, _Head, _Tail...>& __t) noexcept
     { return _Tuple_impl<__i, _Head, _Tail...>::_M_head(__t); }
 
+  /// Return a reference to the unique element of type _Tp of a tuple.
   template <typename _Tp, typename... _Types>
     constexpr _Tp&
     get(tuple<_Types...>& __t) noexcept
-    { return __get_helper2<_Tp>(__t); }
+    { return std::__get_helper2<_Tp>(__t); }
 
+  /// Return a reference to the unique element of type _Tp of a tuple rvalue.
   template <typename _Tp, typename... _Types>
     constexpr _Tp&&
     get(tuple<_Types...>&& __t) noexcept
-    { return std::move(__get_helper2<_Tp>(__t)); }
+    { return std::forward<_Tp&&>(std::__get_helper2<_Tp>(__t)); }
 
+  /// Return a const reference to the unique element of type _Tp of a tuple.
   template <typename _Tp, typename... _Types>
     constexpr const _Tp&
     get(const tuple<_Types...>& __t) noexcept
-    { return __get_helper2<_Tp>(__t); }
+    { return std::__get_helper2<_Tp>(__t); }
 #endif
 
+
   // This class helps construct the various comparison operations on tuples
   template<std::size_t __check_equal_size, std::size_t __i, std::size_t __j,
 	   typename _Tp, typename _Up>
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/type_traits b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/type_traits
index 86fde9e..9a5c06e 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/include/type_traits
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/include/type_traits
@@ -37,6 +37,18 @@
 
 #include <bits/c++config.h>
 
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
+# if defined (__UINT_LEAST16_TYPE__) && defined(__UINT_LEAST32_TYPE__)
+namespace std
+{
+  typedef __UINT_LEAST16_TYPE__ uint_least16_t;
+  typedef __UINT_LEAST32_TYPE__ uint_least32_t;
+}
+# else
+#  include <cstdint>
+# endif
+#endif
+
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -259,7 +271,7 @@
     struct __is_floating_point_helper<long double>
     : public true_type { };
 
-#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128) && (!defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
+#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128) && (!defined (__ANDROID__) || !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
   template<>
     struct __is_floating_point_helper<__float128>
     : public true_type { };
@@ -1583,6 +1595,12 @@
     struct __make_unsigned<long long>
     { typedef unsigned long long __type; };
 
+#if defined(_GLIBCXX_USE_WCHAR_T) && !defined(__WCHAR_UNSIGNED__)
+  template<>
+    struct __make_unsigned<wchar_t> : __make_unsigned<__WCHAR_TYPE__>
+    { };
+#endif
+
 #if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_INT128)
   template<>
     struct __make_unsigned<__int128>
@@ -1665,6 +1683,21 @@
     struct __make_signed<unsigned long long>
     { typedef signed long long __type; };
 
+#if defined(_GLIBCXX_USE_WCHAR_T) && defined(__WCHAR_UNSIGNED__)
+  template<>
+    struct __make_signed<wchar_t> : __make_signed<__WCHAR_TYPE__>
+    { };
+#endif
+
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
+  template<>
+    struct __make_signed<char16_t> : __make_signed<uint_least16_t>
+    { };
+  template<>
+    struct __make_signed<char32_t> : __make_signed<uint_least32_t>
+    { };
+#endif
+
 #if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_INT128)
   template<>
     struct __make_signed<unsigned __int128>
@@ -1938,7 +1971,11 @@
     struct __common_type_impl
     : private __do_common_type_impl
     {
+#if !defined (__ANDROID__)
+      typedef decltype(_S_test<_Tp, _Up>(0)) type;
+#else
       typedef typename decay<decltype(_S_test<_Tp, _Up>(0))>::type type;
+#endif
     };
 
   struct __do_member_type_wrapper
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++config.h
index 103fa47..8395c3b 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 /* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 /* #undef _GLIBCXX_USE_FLOAT128 */
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 /* #undef _GLIBCXX_X86_RDRAND */
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_shared.so
index 9c28e0a..cd1da7f 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_static.a
index 24d5885..0828fc1 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libsupc++.a
index 75ee34b..575f350 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++config.h
index a31d1dd..31c5ce8 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 /* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 /* #undef _GLIBCXX_USE_FLOAT128 */
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 /* #undef _GLIBCXX_X86_RDRAND */
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_shared.so
index a89cb84..b7f230e 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a
index 5b2d1a0..0ef28b3 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libsupc++.a
index d2ed782..81dc103 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_shared.so
index 76fcbed..c93a728 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_static.a
index 1a8ea4e..243e74b 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libsupc++.a
index f9462f0..1024f5d 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/thumb/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++config.h
index a31d1dd..31c5ce8 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 /* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 /* #undef _GLIBCXX_USE_FLOAT128 */
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 /* #undef _GLIBCXX_X86_RDRAND */
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_shared.so
index 368dd9c..c86341c 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_static.a
index fbe31ec..c4618ef 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libsupc++.a
index dcbf3cf..03bd042 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_shared.so
index cc849ce..05844c1 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_static.a
index 1f95356..088483a 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libsupc++.a
index 8a2e4fc..bd32afe 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/thumb/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++config.h
index a31d1dd..31c5ce8 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 /* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 /* #undef _GLIBCXX_USE_FLOAT128 */
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 /* #undef _GLIBCXX_X86_RDRAND */
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_shared.so
index c20fe27..552b8fb 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_static.a
index 7039aae..dcc9449 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libsupc++.a
index 96a3983..6392842 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++config.h
index 103fa47..8395c3b 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 /* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 /* #undef _GLIBCXX_USE_FLOAT128 */
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 /* #undef _GLIBCXX_X86_RDRAND */
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_shared.so
index 1027125..da5ea06 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_static.a
index 03b05b4..8496be7 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libsupc++.a
index 94187b2..e8948e4 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips64/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++config.h
index 6200953..517021f 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 #define _GLIBCXX_USE_DECIMAL_FLOAT 1
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 #define _GLIBCXX_USE_FLOAT128 1
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 #define _GLIBCXX_X86_RDRAND 1
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so
index b068400..bedcb33 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_static.a
index 2b71533..d1a4002 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libsupc++.a
index 52c3e81..d49f3e9 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++config.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++config.h
index a8dc524..3b7cfa9 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++config.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++config.h
@@ -31,7 +31,7 @@
 #define _GLIBCXX_CXX_CONFIG_H 1
 
 // The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20140422
+#define __GLIBCXX__ 20140827
 
 // Macros for various attributes.
 //   _GLIBCXX_PURE
@@ -1293,8 +1293,11 @@
    this host. */
 #define _GLIBCXX_USE_DECIMAL_FLOAT 1
 
-/* Define if __float128 is supported on this host. */
+/* Define if __float128 is supported on this host.
+   Hide all uses of __float128 from Clang.  Google ref b/6422845  */
+#ifndef __clang__
 #define _GLIBCXX_USE_FLOAT128 1
+#endif
 
 /* Defined if gettimeofday is available. */
 #define _GLIBCXX_USE_GETTIMEOFDAY 1
@@ -1345,8 +1348,11 @@
 /* Define to 1 if a verbose library is built, or 0 otherwise. */
 #define _GLIBCXX_VERBOSE 1
 
-/* Defined if as can handle rdrand. */
+/* Defined if as can handle rdrand.
+   Disable when building with Clang.  Google ref b/8680429 */
+#ifndef __clang__
 #define _GLIBCXX_X86_RDRAND 1
+#endif
 
 /* Define to 1 if mutex_timedlock is available. */
 #define _GTHREAD_USE_MUTEX_TIMEDLOCK 0
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++locale.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++locale.h
index aedb13f..028c185 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++locale.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/c++locale.h
@@ -59,13 +59,20 @@
   {
     char* __old = std::setlocale(LC_NUMERIC, 0);
     char* __sav = 0;
-    if (__old && __builtin_strcmp(__old, "C"))
-      {
-	const size_t __len = __builtin_strlen(__old) + 1;
-	__sav = new char[__len];
-	__builtin_memcpy(__sav, __old, __len);
-	std::setlocale(LC_NUMERIC, "C");
+#if defined (__ANDROID__)
+    if (__old)
+      { 
+#endif
+        if (__builtin_strcmp(__old, "C"))
+          {
+            const size_t __len = __builtin_strlen(__old) + 1;
+            __sav = new char[__len];
+            __builtin_memcpy(__sav, __old, __len);
+            std::setlocale(LC_NUMERIC, "C");
+          }
+#if defined (__ANDROID__)
       }
+#endif
 
     __builtin_va_list __args;
     __builtin_va_start(__args, __fmt);
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/ctype_base.h b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/ctype_base.h
index a6ccfb9..d713e0c 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/ctype_base.h
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/include/bits/ctype_base.h
@@ -30,6 +30,7 @@
 
 // Support for Solaris 2.5.1
 
+#if defined (__ANDROID__)
 #if !defined(_U)
 #if !defined(_CTYPE_U)
 #error Bionic header ctype.h does not define either _U nor _CTYPE_U
@@ -43,6 +44,7 @@
 #define _X _CTYPE_X
 #define _B _CTYPE_B
 #endif
+#endif /* __ANDROID__ */
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_shared.so b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_shared.so
index 0a33be7..965a5c9 100755
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_shared.so
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_static.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_static.a
index 5d96f9e..1bbad64 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_static.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libgnustl_static.a
Binary files differ
diff --git a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libsupc++.a b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libsupc++.a
index 31b9c68..50203ab 100644
--- a/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libsupc++.a
+++ b/9/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86_64/libsupc++.a
Binary files differ
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_shared.so b/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_shared.so
index e85d027..dde818d 100755
--- a/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_shared.so
+++ b/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_shared.so
Binary files differ
diff --git a/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_static.a b/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_static.a
index 6a62769..aed5c10 100644
--- a/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_static.a
+++ b/9/sources/cxx-stl/llvm-libc++/libs/mips64/libc++_static.a
Binary files differ