Snap for 8426163 from dc9c79d3f1952058ee0b218f4f651bf10ac6813e to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: Ia2e6a3879e40f3792afc0fc0e7b63e150b463838

86 files changed, 514 insertions, 3276 deletions

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index af5c292..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (C) 2021 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.
-
-package {
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "kernel_configs_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "legacy_notice",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
diff --git a/android-4.19/android-base-conditional.xml b/android-4.19/android-base-conditional.xml
deleted file mode 100644
index 02c3b2d..0000000
--- a/android-4.19/android-base-conditional.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<kernel minlts="4.19.0" />
-
-<!-- KEEP ALPHABETICALLY SORTED -->
-<!-- ARM base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_AEABI</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_OABI_COMPAT</key>
-		<value type="bool">n</value>
-	</config>
-</group>
-
-<!-- ARM64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ARM64_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARMV8_DEPRECATED</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_COMPAT</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CP15_BARRIER_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SETEND_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SWP_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_PAGE_TABLE_ISOLATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_RETPOLINE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- CONFIG_ACPI || CONFIG_OF -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ACPI</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_OF</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_OF</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ACPI</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- EXT4 requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_EXT4_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_EXT4_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- F2FS requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_F2FS_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_F2FS_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config
deleted file mode 100644
index 0867013..0000000
--- a/android-4.19/android-base.config
+++ /dev/null
@@ -1,258 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_BPFILTER is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_FHANDLE is not set
-# CONFIG_FW_CACHE is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_SYSVIPC is not set
-# CONFIG_USELIB is not set
-# CONFIG_VHOST is not set
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_AIO=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ASHMEM=y
-CONFIG_AUDIT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLOCK=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_BPF=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_VERITY=y
-CONFIG_DUMMY=y
-CONFIG_EMBEDDED=y
-CONFIG_EPOLL=y
-CONFIG_EVENTFD=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-CONFIG_FUSE_FS=y
-CONFIG_FUTEX=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HID_GENERIC=y
-CONFIG_HID_SONY=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET=y
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
-CONFIG_IP6_NF_RAW=y
-CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IPV6=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_VTI=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_MATCH_ECN=y
-CONFIG_IP_NF_MATCH_TTL=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_RAW=y
-CONFIG_IP_NF_SECURITY=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_L2TP=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMBARRIER=y
-CONFIG_MMU=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MULTIUSER=y
-CONFIG_NAMESPACES=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_TARGET_SECMARK=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_TRACE=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BPF=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPVTI=y
-CONFIG_NET_KEY=y
-CONFIG_NET_NS=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_NAT=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_SOCKET_IPV6=y
-CONFIG_NO_HZ=y
-CONFIG_PACKET=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PPP=y
-CONFIG_PPPOL2TP=y
-CONFIG_PPP_BSDCOMP=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
-CONFIG_PREEMPT=y
-CONFIG_PROC_FS=y
-CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RTC_CLASS=y
-CONFIG_SCHED_DEBUG=y
-CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_STAGING=y
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_SUSPEND=y
-CONFIG_SYNC_FILE=y
-CONFIG_SYSFS=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TASK_XACCT=y
-CONFIG_TIMERFD=y
-CONFIG_TRACE_GPU_MEM=y
-CONFIG_TTY=y
-CONFIG_TUN=y
-CONFIG_UHID=y
-CONFIG_UID_SYS_STATS=y
-CONFIG_UNIX=y
-CONFIG_USB=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_F_ACC=y
-CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_SUPPORT=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_USER=y
diff --git a/android-4.19/android-recommended-arm.config b/android-4.19/android-recommended-arm.config
deleted file mode 100644
index 1ff0342..0000000
--- a/android-4.19/android-recommended-arm.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_NEON=y
diff --git a/android-4.19/android-recommended-arm64.config b/android-4.19/android-recommended-arm64.config
deleted file mode 100644
index 16ec836..0000000
--- a/android-4.19/android-recommended-arm64.config
+++ /dev/null
@@ -1,7 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_CRYPTO=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/android-4.19/android-recommended-x86.config b/android-4.19/android-recommended-x86.config
deleted file mode 100644
index 0388b3f..0000000
--- a/android-4.19/android-recommended-x86.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/android-4.19/android-recommended.config b/android-4.19/android-recommended.config
deleted file mode 100644
index e47684c..0000000
--- a/android-4.19/android-recommended.config
+++ /dev/null
@@ -1,130 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KSM is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_VT is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_COMPACTION=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_COREDUMP=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_DM_BOW=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_ELF_CORE=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_FTRACE=y
-CONFIG_GREENASIA_FF=y
-CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_ACRUX=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_EMS_FF=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_HOLTEK=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KEYTOUCH=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PRIMAX=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SAITEK=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SPEEDLINK=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WALTOP=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEYS=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MSDOS_FS=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_OVERLAY_FS=y
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PSI=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_RAM=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SCHED_TUNE=y
-CONFIG_SDCARD_FS=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMP=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_TABLET_USB_ACECAD=y
-CONFIG_TABLET_USB_AIPTEK=y
-CONFIG_TABLET_USB_GTCO=y
-CONFIG_TABLET_USB_HANWANG=y
-CONFIG_TABLET_USB_KBTAB=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_VFAT_FS=y
diff --git a/android-4.19/non_debuggable.config b/android-4.19/non_debuggable.config
deleted file mode 100644
index 71b51bf..0000000
--- a/android-4.19/non_debuggable.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_DEBUG_FS is not set
diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml
deleted file mode 100644
index 04ac88d..0000000
--- a/android-5.10/android-base-conditional.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<kernel minlts="5.10.0" />
-
-<!-- KEEP ALPHABETICALLY SORTED -->
-<!-- ARM base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_AEABI</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_OABI_COMPAT</key>
-		<value type="bool">n</value>
-	</config>
-</group>
-
-<!-- ARM64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ARM64_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARMV8_DEPRECATED</key>
-		<value type="bool">y</value>
-	</config>
-	<!--<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>-->
-	<config>
-		<key>CONFIG_COMPAT</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CP15_BARRIER_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SETEND_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SHADOW_CALL_STACK</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SWP_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_KFENCE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_KFENCE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_PAGE_TABLE_ISOLATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_RETPOLINE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86_64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86_64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<!--<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>-->
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- CONFIG_ACPI || CONFIG_OF -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ACPI</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_OF</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_OF</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ACPI</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- EXT4 requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_EXT4_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_EXT4_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- F2FS requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_F2FS_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_F2FS_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
diff --git a/android-5.10/android-recommended-arm.config b/android-5.10/android-recommended-arm.config
deleted file mode 100644
index 1ff0342..0000000
--- a/android-5.10/android-recommended-arm.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_NEON=y
diff --git a/android-5.10/android-recommended-arm64.config b/android-5.10/android-recommended-arm64.config
deleted file mode 100644
index 16ec836..0000000
--- a/android-5.10/android-recommended-arm64.config
+++ /dev/null
@@ -1,7 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_CRYPTO=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/android-5.10/android-recommended-x86.config b/android-5.10/android-recommended-x86.config
deleted file mode 100644
index 0388b3f..0000000
--- a/android-5.10/android-recommended-x86.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/android-5.10/android-recommended.config b/android-5.10/android-recommended.config
deleted file mode 100644
index de28508..0000000
--- a/android-5.10/android-recommended.config
+++ /dev/null
@@ -1,131 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KSM is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_VT is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_COMPACTION=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_COREDUMP=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_DM_BOW=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_ELF_CORE=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_FTRACE=y
-CONFIG_GREENASIA_FF=y
-CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_ACRUX=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_EMS_FF=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_HOLTEK=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KEYTOUCH=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PRIMAX=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SAITEK=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SPEEDLINK=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WALTOP=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEYS=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MSDOS_FS=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_OVERLAY_FS=y
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PSI=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_RAM=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SDCARD_FS=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMP=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_TABLET_USB_ACECAD=y
-CONFIG_TABLET_USB_AIPTEK=y
-CONFIG_TABLET_USB_GTCO=y
-CONFIG_TABLET_USB_HANWANG=y
-CONFIG_TABLET_USB_KBTAB=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_TASK_GROUP=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_VFAT_FS=y
diff --git a/android-5.10/non_debuggable.config b/android-5.10/non_debuggable.config
deleted file mode 100644
index 862fbff..0000000
--- a/android-5.10/non_debuggable.config
+++ /dev/null
@@ -1 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
diff --git a/android-5.4/android-base-conditional.xml b/android-5.4/android-base-conditional.xml
deleted file mode 100644
index 4cff64c..0000000
--- a/android-5.4/android-base-conditional.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<kernel minlts="5.4.0" />
-
-<!-- KEEP ALPHABETICALLY SORTED -->
-<!-- ARM base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_AEABI</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_OABI_COMPAT</key>
-		<value type="bool">n</value>
-	</config>
-</group>
-
-<!-- ARM64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ARM64_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARMV8_DEPRECATED</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_COMPAT</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CP15_BARRIER_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SETEND_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SHADOW_CALL_STACK</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SWP_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_PAGE_TABLE_ISOLATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_RETPOLINE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86_64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86_64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- CONFIG_ACPI || CONFIG_OF -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ACPI</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_OF</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_OF</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ACPI</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- EXT4 requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_EXT4_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_EXT4_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- F2FS requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_F2FS_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_F2FS_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
diff --git a/android-5.4/android-recommended-arm.config b/android-5.4/android-recommended-arm.config
deleted file mode 100644
index 1ff0342..0000000
--- a/android-5.4/android-recommended-arm.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_NEON=y
diff --git a/android-5.4/android-recommended-arm64.config b/android-5.4/android-recommended-arm64.config
deleted file mode 100644
index 755dfc3..0000000
--- a/android-5.4/android-recommended-arm64.config
+++ /dev/null
@@ -1,8 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_CRYPTO=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_KFENCE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/android-5.4/android-recommended-x86.config b/android-5.4/android-recommended-x86.config
deleted file mode 100644
index fe497f2..0000000
--- a/android-5.4/android-recommended-x86.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_KFENCE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/android-5.4/android-recommended.config b/android-5.4/android-recommended.config
deleted file mode 100644
index de28508..0000000
--- a/android-5.4/android-recommended.config
+++ /dev/null
@@ -1,131 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KSM is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_VT is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_COMPACTION=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_COREDUMP=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_DM_BOW=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_ELF_CORE=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_FTRACE=y
-CONFIG_GREENASIA_FF=y
-CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_ACRUX=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_EMS_FF=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_HOLTEK=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KEYTOUCH=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PRIMAX=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SAITEK=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SPEEDLINK=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WALTOP=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEYS=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MSDOS_FS=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_OVERLAY_FS=y
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PSI=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_RAM=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SDCARD_FS=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMP=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_TABLET_USB_ACECAD=y
-CONFIG_TABLET_USB_AIPTEK=y
-CONFIG_TABLET_USB_GTCO=y
-CONFIG_TABLET_USB_HANWANG=y
-CONFIG_TABLET_USB_KBTAB=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_TASK_GROUP=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_VFAT_FS=y
diff --git a/android-5.4/non_debuggable.config b/android-5.4/non_debuggable.config
deleted file mode 100644
index 71b51bf..0000000
--- a/android-5.4/non_debuggable.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_DEBUG_FS is not set
diff --git a/build/Android.bp b/build/Android.bp
index 7c47941..f7efbf6 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 bootstrap_go_package {
     name: "kernel-config-soong-rules",
     pkgPath: "android/soong/kernel/configs",
diff --git a/o-mr1/README.md b/o-mr1/README.md
new file mode 100644
index 0000000..ab63b46
--- /dev/null
+++ b/o-mr1/README.md
@@ -0,0 +1,4 @@
+# Android Kernel Config Fragments For Target Framework Compatibility Matrix Version 2
+
+This directory contains requirements for devices with Target FCM Version 2,
+which are commonly known as "devices launched with O-MR1".
diff --git a/android-5.4/Android.bp b/o-mr1/android-3.18/Android.bp
index 94eec91..0d57e62 100644
--- a/android-5.4/Android.bp
+++ b/o-mr1/android-3.18/Android.bp
@@ -12,23 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
-    name: "kernel_config_current_5.4",
+    name: "kernel_config_o_mr1_3.18",
     srcs: [
         "android-base.config",
-        "non_debuggable.config",
-    ],
-    debuggable_srcs: [
-        "android-base.config",
+        "android-base-arm64.config",
     ],
     meta: "android-base-conditional.xml",
 }
diff --git a/o-mr1/android-3.18/android-base-arm64.config b/o-mr1/android-3.18/android-base-arm64.config
new file mode 100644
index 0000000..43f23d6
--- /dev/null
+++ b/o-mr1/android-3.18/android-base-arm64.config
@@ -0,0 +1,5 @@
+#  KEEP ALPHABETICALLY SORTED
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
diff --git a/o-mr1/android-3.18/android-base-conditional.xml b/o-mr1/android-3.18/android-base-conditional.xml
new file mode 100644
index 0000000..9d59127
--- /dev/null
+++ b/o-mr1/android-3.18/android-base-conditional.xml
@@ -0,0 +1 @@
+<kernel minlts="3.18.0" />
diff --git a/o-mr1/android-3.18/android-base.config b/o-mr1/android-3.18/android-base.config
new file mode 100644
index 0000000..7eb1e71
--- /dev/null
+++ b/o-mr1/android-3.18/android-base.config
@@ -0,0 +1,153 @@
+#  KEEP ALPHABETICALLY SORTED
+# CONFIG_DEVKMEM is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_FHANDLE is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFS_FS is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_USELIB is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ASHMEM=y
+CONFIG_AUDIT=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+CONFIG_EMBEDDED=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_INET=y
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_INET_ESP=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_RAW=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IPV6=y
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_NF_ARPFILTER=y
+CONFIG_IP_NF_ARPTABLES=y
+CONFIG_IP_NF_ARP_MANGLE=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MATCH_AH=y
+CONFIG_IP_NF_MATCH_ECN=y
+CONFIG_IP_NF_MATCH_TTL=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_RAW=y
+CONFIG_IP_NF_SECURITY=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_MAC=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
+CONFIG_NETFILTER_XT_MATCH_STRING=y
+CONFIG_NETFILTER_XT_MATCH_TIME=y
+CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
+CONFIG_NETFILTER_XT_TARGET_TRACE=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_CLS_U32=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_U32=y
+CONFIG_NET_KEY=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_NF_CONNTRACK_IRC=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_NAT=y
+CONFIG_NO_HZ=y
+CONFIG_PACKET=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PPP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_MPPE=y
+CONFIG_PREEMPT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_RTC_CLASS=y
+CONFIG_SECCOMP=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_STAGING=y
+CONFIG_SWITCH=y
+CONFIG_SYNC=y
+CONFIG_TUN=y
+CONFIG_UID_SYS_STATS=y
+CONFIG_UNIX=y
+CONFIG_USB_GADGET=y
+CONFIG_XFRM_USER=y
diff --git a/android-5.10/Android.bp b/o-mr1/android-4.4/Android.bp
index 27f1ad2..0673dfd 100644
--- a/android-5.10/Android.bp
+++ b/o-mr1/android-4.4/Android.bp
@@ -12,23 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
-    name: "kernel_config_current_5.10",
+    name: "kernel_config_o_mr1_4.4",
     srcs: [
         "android-base.config",
-        "non_debuggable.config",
-    ],
-    debuggable_srcs: [
-        "android-base.config",
+        "android-base-arm64.config",
     ],
     meta: "android-base-conditional.xml",
 }
diff --git a/o-mr1/android-4.4/android-base-arm64.config b/o-mr1/android-4.4/android-base-arm64.config
new file mode 100644
index 0000000..43f23d6
--- /dev/null
+++ b/o-mr1/android-4.4/android-base-arm64.config
@@ -0,0 +1,5 @@
+#  KEEP ALPHABETICALLY SORTED
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
diff --git a/o-mr1/android-4.4/android-base-conditional.xml b/o-mr1/android-4.4/android-base-conditional.xml
new file mode 100644
index 0000000..fda58c3
--- /dev/null
+++ b/o-mr1/android-4.4/android-base-conditional.xml
@@ -0,0 +1 @@
+<kernel minlts="4.4.0" />
diff --git a/android-5.4/android-base.config b/o-mr1/android-4.4/android-base.config
index d6e1f5a..f987f24 100644
--- a/android-5.4/android-base.config
+++ b/o-mr1/android-4.4/android-base.config
@@ -1,88 +1,39 @@
 #  KEEP ALPHABETICALLY SORTED
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_BPFILTER is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
-# CONFIG_FW_CACHE is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+### CONFIG_INET_LRO is not set # TODO (b/63796046) remove redundant "#"
 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_AIO=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLOCK=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_BPF=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_VERITY=y
-CONFIG_DUMMY=y
 CONFIG_EMBEDDED=y
-CONFIG_EPOLL=y
-CONFIG_EVENTFD=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-CONFIG_FUSE_FS=y
-CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_HID_GENERIC=y
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_INET=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
 CONFIG_IP6_NF_RAW=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IPV6=y
@@ -91,7 +42,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_VTI=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -101,6 +51,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_NAT=y
@@ -110,21 +61,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_L2TP=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMBARRIER=y
-CONFIG_MMU=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MULTIUSER=y
-CONFIG_NAMESPACES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=y
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -136,11 +78,10 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -151,7 +92,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -161,22 +101,19 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BPF=y
 CONFIG_NET_CLS_U32=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPVTI=y
 CONFIG_NET_KEY=y
-CONFIG_NET_NS=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_AMANDA=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
 CONFIG_NF_CONNTRACK_PPTP=y
@@ -188,68 +125,36 @@ CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_NAT=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_SOCKET_IPV6=y
 CONFIG_NO_HZ=y
 CONFIG_PACKET=y
+CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
-CONFIG_POSIX_TIMERS=y
 CONFIG_PPP=y
-CONFIG_PPPOL2TP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
 CONFIG_PREEMPT=y
-CONFIG_PROC_FS=y
 CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RD_LZ4=y
 CONFIG_RTC_CLASS=y
-CONFIG_SCHED_DEBUG=y
 CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY_SELINUX=y
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STAGING=y
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_SUSPEND=y
-CONFIG_SYNC_FILE=y
-CONFIG_SYSFS=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TASK_XACCT=y
-CONFIG_TIMERFD=y
-CONFIG_TRACE_GPU_MEM=y
-CONFIG_TTY=y
+CONFIG_SYNC=y
 CONFIG_TUN=y
-CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
-CONFIG_USB=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_SUPPORT=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_USER=y
diff --git a/android-4.19/Android.bp b/o-mr1/android-4.9/Android.bp
index 497baa0..194cda8 100644
--- a/android-4.19/Android.bp
+++ b/o-mr1/android-4.9/Android.bp
@@ -12,23 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
-    name: "kernel_config_current_4.19",
+    name: "kernel_config_o_mr1_4.9",
     srcs: [
         "android-base.config",
-        "non_debuggable.config",
-    ],
-    debuggable_srcs: [
-        "android-base.config",
+        "android-base-arm64.config",
     ],
     meta: "android-base-conditional.xml",
 }
diff --git a/o-mr1/android-4.9/android-base-arm64.config b/o-mr1/android-4.9/android-base-arm64.config
new file mode 100644
index 0000000..43f23d6
--- /dev/null
+++ b/o-mr1/android-4.9/android-base-arm64.config
@@ -0,0 +1,5 @@
+#  KEEP ALPHABETICALLY SORTED
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
diff --git a/o-mr1/android-4.9/android-base-conditional.xml b/o-mr1/android-4.9/android-base-conditional.xml
new file mode 100644
index 0000000..b10c0ea
--- /dev/null
+++ b/o-mr1/android-4.9/android-base-conditional.xml
@@ -0,0 +1 @@
+<kernel minlts="4.9.0" />
diff --git a/s/android-5.4/android-base.config b/o-mr1/android-4.9/android-base.config
index d6e1f5a..88fd01d 100644
--- a/s/android-5.4/android-base.config
+++ b/o-mr1/android-4.9/android-base.config
@@ -1,88 +1,40 @@
 #  KEEP ALPHABETICALLY SORTED
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_BPFILTER is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
-# CONFIG_FW_CACHE is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_INET_LRO is not set
 # CONFIG_NFSD is not set
 # CONFIG_NFS_FS is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_AIO=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLOCK=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_BPF=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
+CONFIG_CGROUP_BPF=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_VERITY=y
-CONFIG_DUMMY=y
 CONFIG_EMBEDDED=y
-CONFIG_EPOLL=y
-CONFIG_EVENTFD=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-CONFIG_FUSE_FS=y
-CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_HID_GENERIC=y
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_INET=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
 CONFIG_IP6_NF_RAW=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IPV6=y
@@ -91,7 +43,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_VTI=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -101,6 +52,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_NAT=y
@@ -110,21 +62,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_L2TP=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMBARRIER=y
-CONFIG_MMU=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MULTIUSER=y
-CONFIG_NAMESPACES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=y
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -136,11 +79,10 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -151,7 +93,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -161,22 +102,19 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BPF=y
 CONFIG_NET_CLS_U32=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPVTI=y
 CONFIG_NET_KEY=y
-CONFIG_NET_NS=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_AMANDA=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
 CONFIG_NF_CONNTRACK_PPTP=y
@@ -188,68 +126,35 @@ CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_NAT=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_SOCKET_IPV6=y
 CONFIG_NO_HZ=y
 CONFIG_PACKET=y
+CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
-CONFIG_POSIX_TIMERS=y
 CONFIG_PPP=y
-CONFIG_PPPOL2TP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
 CONFIG_PREEMPT=y
-CONFIG_PROC_FS=y
 CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RD_LZ4=y
 CONFIG_RTC_CLASS=y
-CONFIG_SCHED_DEBUG=y
 CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY_SELINUX=y
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STAGING=y
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_SUSPEND=y
-CONFIG_SYNC_FILE=y
-CONFIG_SYSFS=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TASK_XACCT=y
-CONFIG_TIMERFD=y
-CONFIG_TRACE_GPU_MEM=y
-CONFIG_TTY=y
 CONFIG_TUN=y
-CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
-CONFIG_USB=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_SUPPORT=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_USER=y
diff --git a/o/README.md b/o/README.md
new file mode 100644
index 0000000..584bcbc
--- /dev/null
+++ b/o/README.md
@@ -0,0 +1,4 @@
+# Android Kernel Config Fragments For Target Framework Compatibility Matrix Version 1
+
+This directory contains requirements for devices with Target FCM Version 1,
+which are commonly known as "devices launched with O".
diff --git a/s/android-5.4/Android.bp b/o/android-3.18/Android.bp
index 84e32cf..1617d49 100644
--- a/s/android-5.4/Android.bp
+++ b/o/android-3.18/Android.bp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 The Android Open Source Project
+// Copyright (C) 2018 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.
@@ -12,23 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
-    name: "kernel_config_s_5.4",
+    name: "kernel_config_o_3.18",
     srcs: [
         "android-base.config",
-        "non_debuggable.config",
-    ],
-    debuggable_srcs: [
-        "android-base.config",
+        "android-base-arm64.config",
     ],
     meta: "android-base-conditional.xml",
 }
diff --git a/o/android-3.18/android-base-arm64.config b/o/android-3.18/android-base-arm64.config
new file mode 100644
index 0000000..43f23d6
--- /dev/null
+++ b/o/android-3.18/android-base-arm64.config
@@ -0,0 +1,5 @@
+#  KEEP ALPHABETICALLY SORTED
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
diff --git a/o/android-3.18/android-base-conditional.xml b/o/android-3.18/android-base-conditional.xml
new file mode 100644
index 0000000..9d59127
--- /dev/null
+++ b/o/android-3.18/android-base-conditional.xml
@@ -0,0 +1 @@
+<kernel minlts="3.18.0" />
diff --git a/o/android-3.18/android-base.config b/o/android-3.18/android-base.config
new file mode 100644
index 0000000..417e262
--- /dev/null
+++ b/o/android-3.18/android-base.config
@@ -0,0 +1,151 @@
+#  KEEP ALPHABETICALLY SORTED
+# CONFIG_DEVKMEM is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_FHANDLE is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_USELIB is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ASHMEM=y
+CONFIG_AUDIT=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+CONFIG_EMBEDDED=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_INET=y
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_INET_ESP=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_RAW=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IPV6=y
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_NF_ARPFILTER=y
+CONFIG_IP_NF_ARPTABLES=y
+CONFIG_IP_NF_ARP_MANGLE=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MATCH_AH=y
+CONFIG_IP_NF_MATCH_ECN=y
+CONFIG_IP_NF_MATCH_TTL=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_RAW=y
+CONFIG_IP_NF_SECURITY=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_NET=y
+CONFIG_NETDEVICES=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_MAC=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
+CONFIG_NETFILTER_XT_MATCH_STRING=y
+CONFIG_NETFILTER_XT_MATCH_TIME=y
+CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_TARGET_TPROXY=y
+CONFIG_NETFILTER_XT_TARGET_TRACE=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_CLS_U32=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_U32=y
+CONFIG_NET_KEY=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_NF_CONNTRACK_IRC=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_NAT=y
+CONFIG_NO_HZ=y
+CONFIG_PACKET=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PPP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_MPPE=y
+CONFIG_PREEMPT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_RTC_CLASS=y
+CONFIG_SECCOMP=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_STAGING=y
+CONFIG_SWITCH=y
+CONFIG_SYNC=y
+CONFIG_TUN=y
+CONFIG_UID_SYS_STATS=y
+CONFIG_UNIX=y
+CONFIG_USB_GADGET=y
+CONFIG_XFRM_USER=y
diff --git a/o/android-4.4/Android.bp b/o/android-4.4/Android.bp
new file mode 100644
index 0000000..b347d0d
--- /dev/null
+++ b/o/android-4.4/Android.bp
@@ -0,0 +1,22 @@
+// Copyright (C) 2018 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.
+
+kernel_config {
+    name: "kernel_config_o_4.4",
+    srcs: [
+        "android-base.config",
+        "android-base-arm64.config",
+    ],
+    meta: "android-base-conditional.xml",
+}
diff --git a/o/android-4.4/android-base-arm64.config b/o/android-4.4/android-base-arm64.config
new file mode 100644
index 0000000..43f23d6
--- /dev/null
+++ b/o/android-4.4/android-base-arm64.config
@@ -0,0 +1,5 @@
+#  KEEP ALPHABETICALLY SORTED
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
diff --git a/o/android-4.4/android-base-conditional.xml b/o/android-4.4/android-base-conditional.xml
new file mode 100644
index 0000000..fda58c3
--- /dev/null
+++ b/o/android-4.4/android-base-conditional.xml
@@ -0,0 +1 @@
+<kernel minlts="4.4.0" />
diff --git a/s/android-5.10/android-base.config b/o/android-4.4/android-base.config
index d6e1f5a..c86c5f0 100644
--- a/s/android-5.10/android-base.config
+++ b/o/android-4.4/android-base.config
@@ -1,88 +1,37 @@
 #  KEEP ALPHABETICALLY SORTED
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_BPFILTER is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
-# CONFIG_FW_CACHE is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_AIO=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLOCK=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_BPF=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_VERITY=y
-CONFIG_DUMMY=y
 CONFIG_EMBEDDED=y
-CONFIG_EPOLL=y
-CONFIG_EVENTFD=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-CONFIG_FUSE_FS=y
-CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_HID_GENERIC=y
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_INET=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
 CONFIG_IP6_NF_RAW=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IPV6=y
@@ -91,7 +40,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_VTI=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -101,6 +49,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_NAT=y
@@ -110,21 +59,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_L2TP=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMBARRIER=y
-CONFIG_MMU=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MULTIUSER=y
-CONFIG_NAMESPACES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=y
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -136,11 +76,10 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -151,7 +90,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -161,22 +99,19 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BPF=y
 CONFIG_NET_CLS_U32=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPVTI=y
 CONFIG_NET_KEY=y
-CONFIG_NET_NS=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_AMANDA=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
 CONFIG_NF_CONNTRACK_PPTP=y
@@ -188,68 +123,36 @@ CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_NAT=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_SOCKET_IPV6=y
 CONFIG_NO_HZ=y
 CONFIG_PACKET=y
+CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
-CONFIG_POSIX_TIMERS=y
 CONFIG_PPP=y
-CONFIG_PPPOL2TP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
 CONFIG_PREEMPT=y
-CONFIG_PROC_FS=y
 CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RD_LZ4=y
 CONFIG_RTC_CLASS=y
-CONFIG_SCHED_DEBUG=y
 CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY_SELINUX=y
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STAGING=y
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_SUSPEND=y
-CONFIG_SYNC_FILE=y
-CONFIG_SYSFS=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TASK_XACCT=y
-CONFIG_TIMERFD=y
-CONFIG_TRACE_GPU_MEM=y
-CONFIG_TTY=y
+CONFIG_SYNC=y
 CONFIG_TUN=y
-CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
-CONFIG_USB=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_SUPPORT=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_USER=y
diff --git a/o/android-4.9/Android.bp b/o/android-4.9/Android.bp
new file mode 100644
index 0000000..886ad2b
--- /dev/null
+++ b/o/android-4.9/Android.bp
@@ -0,0 +1,22 @@
+// Copyright (C) 2018 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.
+
+kernel_config {
+    name: "kernel_config_o_4.9",
+    srcs: [
+        "android-base.config",
+        "android-base-arm64.config",
+    ],
+    meta: "android-base-conditional.xml",
+}
diff --git a/o/android-4.9/android-base-arm64.config b/o/android-4.9/android-base-arm64.config
new file mode 100644
index 0000000..43f23d6
--- /dev/null
+++ b/o/android-4.9/android-base-arm64.config
@@ -0,0 +1,5 @@
+#  KEEP ALPHABETICALLY SORTED
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+CONFIG_SWP_EMULATION=y
diff --git a/o/android-4.9/android-base-conditional.xml b/o/android-4.9/android-base-conditional.xml
new file mode 100644
index 0000000..b10c0ea
--- /dev/null
+++ b/o/android-4.9/android-base-conditional.xml
@@ -0,0 +1 @@
+<kernel minlts="4.9.0" />
diff --git a/android-5.10/android-base.config b/o/android-4.9/android-base.config
index 5de76f0..e21db06 100644
--- a/android-5.10/android-base.config
+++ b/o/android-4.9/android-base.config
@@ -1,90 +1,37 @@
 #  KEEP ALPHABETICALLY SORTED
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_BPFILTER is not set
+# CONFIG_DEVKMEM is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
-# CONFIG_FW_CACHE is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_AIO=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLOCK=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
 CONFIG_CGROUPS=y
-CONFIG_CGROUP_BPF=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_VERITY=y
-CONFIG_DUMMY=y
 CONFIG_EMBEDDED=y
-CONFIG_EPOLL=y
-CONFIG_EVENTFD=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-CONFIG_FUSE_FS=y
-CONFIG_FUTEX=y
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_HID_GENERIC=y
-CONFIG_HID_PLAYSTATION=y
-CONFIG_PLAYSTATION_FF=y
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_INET=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
 CONFIG_IP6_NF_RAW=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IPV6=y
@@ -93,7 +40,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_VTI=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
@@ -103,6 +49,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MATCH_AH=y
 CONFIG_IP_NF_MATCH_ECN=y
 CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_NAT=y
@@ -112,21 +59,12 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=y
 CONFIG_IP_NF_TARGET_REDIRECT=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_L2TP=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMBARRIER=y
-CONFIG_MMU=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
-CONFIG_MULTIUSER=y
-CONFIG_NAMESPACES=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=y
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -138,11 +76,10 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -153,7 +90,6 @@ CONFIG_NETFILTER_XT_MATCH_U32=y
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 CONFIG_NETFILTER_XT_TARGET_MARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -163,22 +99,19 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 CONFIG_NETFILTER_XT_TARGET_TPROXY=y
 CONFIG_NETFILTER_XT_TARGET_TRACE=y
 CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BPF=y
 CONFIG_NET_CLS_U32=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPVTI=y
 CONFIG_NET_KEY=y
-CONFIG_NET_NS=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_AMANDA=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_FTP=y
 CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_CONNTRACK_IRC=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=y
 CONFIG_NF_CONNTRACK_PPTP=y
@@ -190,68 +123,35 @@ CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_NAT=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_SOCKET_IPV6=y
 CONFIG_NO_HZ=y
 CONFIG_PACKET=y
+CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
-CONFIG_POSIX_TIMERS=y
 CONFIG_PPP=y
-CONFIG_PPPOL2TP=y
+CONFIG_PPPOLAC=y
+CONFIG_PPPOPNS=y
 CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
 CONFIG_PREEMPT=y
-CONFIG_PROC_FS=y
 CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RD_LZ4=y
 CONFIG_RTC_CLASS=y
-CONFIG_SCHED_DEBUG=y
 CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY_SELINUX=y
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STAGING=y
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_SUSPEND=y
-CONFIG_SYNC_FILE=y
-CONFIG_SYSFS=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TASK_XACCT=y
-CONFIG_TIMERFD=y
-CONFIG_TRACE_GPU_MEM=y
-CONFIG_TTY=y
 CONFIG_TUN=y
-CONFIG_UHID=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
-CONFIG_USB=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_F_ACC=y
 CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_F_PTP=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_SUPPORT=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_USER=y
diff --git a/p/android-4.14/Android.bp b/p/android-4.14/Android.bp
index 4444de9..8ced9dd 100644
--- a/p/android-4.14/Android.bp
+++ b/p/android-4.14/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_p_4.14",
     srcs: [
diff --git a/p/android-4.4/Android.bp b/p/android-4.4/Android.bp
index b924ec2..029d893 100644
--- a/p/android-4.4/Android.bp
+++ b/p/android-4.4/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_p_4.4",
     srcs: [
diff --git a/p/android-4.9/Android.bp b/p/android-4.9/Android.bp
index 43afed7..e9f2e48 100644
--- a/p/android-4.9/Android.bp
+++ b/p/android-4.9/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_p_4.9",
     srcs: [
diff --git a/q/android-4.14/Android.bp b/q/android-4.14/Android.bp
index 2d58711..ef3f681 100644
--- a/q/android-4.14/Android.bp
+++ b/q/android-4.14/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_q_4.14",
     srcs: [
diff --git a/q/android-4.14/android-base-conditional.xml b/q/android-4.14/android-base-conditional.xml
index ea5a1b5..bb87ec0 100644
--- a/q/android-4.14/android-base-conditional.xml
+++ b/q/android-4.14/android-base-conditional.xml
@@ -14,6 +14,10 @@
 		<value type="bool">y</value>
 	</config>
 	<config>
+		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
+		<value type="bool">y</value>
+	</config>
+	<config>
 		<key>CONFIG_DEVKMEM</key>
 		<value type="bool">n</value>
 	</config>
@@ -23,40 +27,6 @@
 	</config>
 </group>
 
-<!-- For ARM, CONFIG_CPU_SW_DOMAIN_PAN || CONFIG_CPU_TTBR0_PAN -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-		<config>
-			<key>CONFIG_CPU_TTBR0_PAN</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-		<config>
-			<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_CPU_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
 <!-- ARM64 base requirements -->
 <group>
 	<conditions>
diff --git a/q/android-4.19/Android.bp b/q/android-4.19/Android.bp
index 6415070..be0ed79 100644
--- a/q/android-4.19/Android.bp
+++ b/q/android-4.19/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_q_4.19",
     srcs: [
diff --git a/q/android-4.9/Android.bp b/q/android-4.9/Android.bp
index f9c2154..3f75405 100644
--- a/q/android-4.9/Android.bp
+++ b/q/android-4.9/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_q_4.9",
     srcs: [
diff --git a/r/android-4.14/Android.bp b/r/android-4.14/Android.bp
index a9c0f3a..63d954b 100644
--- a/r/android-4.14/Android.bp
+++ b/r/android-4.14/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_r_4.14",
     srcs: [
diff --git a/r/android-4.14/android-base-conditional.xml b/r/android-4.14/android-base-conditional.xml
index 5b56452..b38fde8 100644
--- a/r/android-4.14/android-base-conditional.xml
+++ b/r/android-4.14/android-base-conditional.xml
@@ -121,6 +121,20 @@
 	</config>
 </group>
 
+<!-- CONFIG_IKHEADERS=y || CONFIG_IKHEADERS=m -->
+<group>
+	<conditions>
+		<config>
+			<key>CONFIG_IKHEADERS</key>
+			<value type="tristate">n</value>
+		</config>
+	</conditions>
+	<config>
+		<key>DISALLOW_CONFIG_IKHEADERS_IS_N</key>
+		<value type="bool">y</value>
+	</config>
+</group>
+
 <!-- EXT4 requirements -->
 <group>
 	<conditions>
diff --git a/r/android-4.14/android-base.config b/r/android-4.14/android-base.config
index a126f5d..542251b 100644
--- a/r/android-4.14/android-base.config
+++ b/r/android-4.14/android-base.config
@@ -1,4 +1,5 @@
 #  KEEP ALPHABETICALLY SORTED
+# CONFIG_CRYPTO_MD4 is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_IP6_NF_NAT is not set
diff --git a/r/android-4.19/Android.bp b/r/android-4.19/Android.bp
index 38b9688..e9b38fa 100644
--- a/r/android-4.19/Android.bp
+++ b/r/android-4.19/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_r_4.19",
     srcs: [
diff --git a/r/android-4.19/android-base-conditional.xml b/r/android-4.19/android-base-conditional.xml
index e5b8635..5d5a477 100644
--- a/r/android-4.19/android-base-conditional.xml
+++ b/r/android-4.19/android-base-conditional.xml
@@ -121,6 +121,20 @@
 	</config>
 </group>
 
+<!-- CONFIG_IKHEADERS=y || CONFIG_IKHEADERS=m -->
+<group>
+	<conditions>
+		<config>
+			<key>CONFIG_IKHEADERS</key>
+			<value type="tristate">n</value>
+		</config>
+	</conditions>
+	<config>
+		<key>DISALLOW_CONFIG_IKHEADERS_IS_N</key>
+		<value type="bool">y</value>
+	</config>
+</group>
+
 <!-- EXT4 requirements -->
 <group>
 	<conditions>
diff --git a/r/android-4.19/android-base.config b/r/android-4.19/android-base.config
index fef4c6f..f942b8e 100644
--- a/r/android-4.19/android-base.config
+++ b/r/android-4.19/android-base.config
@@ -1,6 +1,7 @@
 #  KEEP ALPHABETICALLY SORTED
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_BPFILTER is not set
+# CONFIG_CRYPTO_MD4 is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_FW_CACHE is not set
diff --git a/r/android-5.4/Android.bp b/r/android-5.4/Android.bp
index 28d3fa2..0245b4c 100644
--- a/r/android-5.4/Android.bp
+++ b/r/android-5.4/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 kernel_config {
     name: "kernel_config_r_5.4",
     srcs: [
diff --git a/r/android-5.4/android-base-conditional.xml b/r/android-5.4/android-base-conditional.xml
index d54f670..2617316 100644
--- a/r/android-5.4/android-base-conditional.xml
+++ b/r/android-5.4/android-base-conditional.xml
@@ -1,4 +1,4 @@
-<kernel minlts="5.4.61" />
+<kernel minlts="5.4.42" />
 
 <!-- KEEP ALPHABETICALLY SORTED -->
 <!-- ARM base requirements -->
@@ -143,6 +143,20 @@
 	</config>
 </group>
 
+<!-- CONFIG_IKHEADERS=y || CONFIG_IKHEADERS=m -->
+<group>
+	<conditions>
+		<config>
+			<key>CONFIG_IKHEADERS</key>
+			<value type="tristate">n</value>
+		</config>
+	</conditions>
+	<config>
+		<key>DISALLOW_CONFIG_IKHEADERS_IS_N</key>
+		<value type="bool">y</value>
+	</config>
+</group>
+
 <!-- EXT4 requirements -->
 <group>
 	<conditions>
diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config
index 15c784c..c78e8e1 100644
--- a/r/android-5.4/android-base.config
+++ b/r/android-5.4/android-base.config
@@ -1,6 +1,7 @@
 #  KEEP ALPHABETICALLY SORTED
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_BPFILTER is not set
+# CONFIG_CRYPTO_MD4 is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_FW_CACHE is not set
diff --git a/s/android-4.19/Android.bp b/s/android-4.19/Android.bp
deleted file mode 100644
index 3b49890..0000000
--- a/s/android-4.19/Android.bp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2021 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.
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
-kernel_config {
-    name: "kernel_config_s_4.19",
-    srcs: [
-        "android-base.config",
-        "non_debuggable.config",
-    ],
-    debuggable_srcs: [
-        "android-base.config",
-    ],
-    meta: "android-base-conditional.xml",
-}
diff --git a/s/android-4.19/android-base-conditional.xml b/s/android-4.19/android-base-conditional.xml
deleted file mode 100644
index c7de80c..0000000
--- a/s/android-4.19/android-base-conditional.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<kernel minlts="4.19.191" />
-
-<!-- KEEP ALPHABETICALLY SORTED -->
-<!-- ARM base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_AEABI</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_OABI_COMPAT</key>
-		<value type="bool">n</value>
-	</config>
-</group>
-
-<!-- ARM64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ARM64_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARMV8_DEPRECATED</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_COMPAT</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CP15_BARRIER_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SETEND_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SWP_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_PAGE_TABLE_ISOLATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_RETPOLINE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- CONFIG_ACPI || CONFIG_OF -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ACPI</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_OF</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_OF</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ACPI</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- EXT4 requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_EXT4_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_EXT4_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- F2FS requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_F2FS_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_F2FS_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
diff --git a/s/android-4.19/android-base.config b/s/android-4.19/android-base.config
deleted file mode 100644
index d2bb2ad..0000000
--- a/s/android-4.19/android-base.config
+++ /dev/null
@@ -1,259 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_BPFILTER is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_FHANDLE is not set
-# CONFIG_FW_CACHE is not set
-# CONFIG_IP6_NF_NAT is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_NFSD is not set
-# CONFIG_NFS_FS is not set
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_SYSVIPC is not set
-# CONFIG_USELIB is not set
-# CONFIG_VHOST is not set
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_AIO=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ASHMEM=y
-CONFIG_AUDIT=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLOCK=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_BPF=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CHACHA20POLY1305=y
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XCBC=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-CONFIG_DM_SNAPSHOT=y
-CONFIG_DM_VERITY=y
-CONFIG_DUMMY=y
-CONFIG_EMBEDDED=y
-CONFIG_EPOLL=y
-CONFIG_EVENTFD=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
-CONFIG_FUSE_FS=y
-CONFIG_FUTEX=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HID_GENERIC=y
-CONFIG_HID_SONY=y
-CONFIG_SONY_FF=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET=y
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_ESP=y
-CONFIG_INET_UDP_DIAG=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_MANGLE=y
-CONFIG_IP6_NF_MATCH_RPFILTER=y
-CONFIG_IP6_NF_RAW=y
-CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IPV6=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_VTI=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_MATCH_ECN=y
-CONFIG_IP_NF_MATCH_TTL=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_RAW=y
-CONFIG_IP_NF_SECURITY=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_JOYSTICK_XPAD=y
-CONFIG_L2TP=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
-CONFIG_MEMBARRIER=y
-CONFIG_MMU=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MULTIUSER=y
-CONFIG_NAMESPACES=y
-CONFIG_NET=y
-CONFIG_NETDEVICES=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_TARGET_SECMARK=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_TRACE=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BPF=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IPVTI=y
-CONFIG_NET_KEY=y
-CONFIG_NET_NS=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_NAT=y
-CONFIG_NF_SOCKET_IPV4=y
-CONFIG_NF_SOCKET_IPV6=y
-CONFIG_NO_HZ=y
-CONFIG_PACKET=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PPP=y
-CONFIG_PPPOL2TP=y
-CONFIG_PPP_BSDCOMP=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
-CONFIG_PREEMPT=y
-CONFIG_PROC_FS=y
-CONFIG_PROFILING=y
-CONFIG_PSI=y
-CONFIG_QFMT_V2=y
-CONFIG_QUOTA=y
-CONFIG_QUOTACTL=y
-CONFIG_RTC_CLASS=y
-CONFIG_SCHED_DEBUG=y
-CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SHMEM=y
-CONFIG_SIGNALFD=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_STAGING=y
-CONFIG_STATIC_USERMODEHELPER=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_SUSPEND=y
-CONFIG_SYNC_FILE=y
-CONFIG_SYSFS=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_TASK_XACCT=y
-CONFIG_TIMERFD=y
-CONFIG_TRACE_GPU_MEM=y
-CONFIG_TTY=y
-CONFIG_TUN=y
-CONFIG_UHID=y
-CONFIG_UID_SYS_STATS=y
-CONFIG_UNIX=y
-CONFIG_USB=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_F_ACC=y
-CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_SUPPORT=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=y
-CONFIG_XFRM_INTERFACE=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_USER=y
diff --git a/s/android-4.19/android-recommended-arm.config b/s/android-4.19/android-recommended-arm.config
deleted file mode 100644
index 1ff0342..0000000
--- a/s/android-4.19/android-recommended-arm.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_NEON=y
diff --git a/s/android-4.19/android-recommended-arm64.config b/s/android-4.19/android-recommended-arm64.config
deleted file mode 100644
index 16ec836..0000000
--- a/s/android-4.19/android-recommended-arm64.config
+++ /dev/null
@@ -1,7 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_CRYPTO=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/s/android-4.19/android-recommended-x86.config b/s/android-4.19/android-recommended-x86.config
deleted file mode 100644
index 0388b3f..0000000
--- a/s/android-4.19/android-recommended-x86.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/s/android-4.19/android-recommended.config b/s/android-4.19/android-recommended.config
deleted file mode 100644
index e47684c..0000000
--- a/s/android-4.19/android-recommended.config
+++ /dev/null
@@ -1,130 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KSM is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_VT is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_COMPACTION=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_COREDUMP=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_DM_BOW=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_ELF_CORE=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_FTRACE=y
-CONFIG_GREENASIA_FF=y
-CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_ACRUX=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_EMS_FF=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_HOLTEK=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KEYTOUCH=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PRIMAX=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SAITEK=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SPEEDLINK=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WALTOP=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEYS=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MSDOS_FS=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_OVERLAY_FS=y
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PSI=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_RAM=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SCHED_TUNE=y
-CONFIG_SDCARD_FS=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMP=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_TABLET_USB_ACECAD=y
-CONFIG_TABLET_USB_AIPTEK=y
-CONFIG_TABLET_USB_GTCO=y
-CONFIG_TABLET_USB_HANWANG=y
-CONFIG_TABLET_USB_KBTAB=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_VFAT_FS=y
diff --git a/s/android-4.19/non_debuggable.config b/s/android-4.19/non_debuggable.config
deleted file mode 100644
index 71b51bf..0000000
--- a/s/android-4.19/non_debuggable.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_DEBUG_FS is not set
diff --git a/s/android-5.10/Android.bp b/s/android-5.10/Android.bp
deleted file mode 100644
index bd05baa..0000000
--- a/s/android-5.10/Android.bp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2021 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.
-
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   legacy_notice
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
-kernel_config {
-    name: "kernel_config_s_5.10",
-    srcs: [
-        "android-base.config",
-        "non_debuggable.config",
-    ],
-    debuggable_srcs: [
-        "android-base.config",
-    ],
-    meta: "android-base-conditional.xml",
-}
diff --git a/s/android-5.10/android-base-conditional.xml b/s/android-5.10/android-base-conditional.xml
deleted file mode 100644
index aae1847..0000000
--- a/s/android-5.10/android-base-conditional.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<kernel minlts="5.10.43" />
-
-<!-- KEEP ALPHABETICALLY SORTED -->
-<!-- ARM base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_AEABI</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_OABI_COMPAT</key>
-		<value type="bool">n</value>
-	</config>
-</group>
-
-<!-- ARM64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ARM64_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARMV8_DEPRECATED</key>
-		<value type="bool">y</value>
-	</config>
-	<!--<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>-->
-	<config>
-		<key>CONFIG_COMPAT</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CP15_BARRIER_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SETEND_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SHADOW_CALL_STACK</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SWP_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_KFENCE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_KFENCE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_PAGE_TABLE_ISOLATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_RETPOLINE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86_64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86_64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<!--<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>-->
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- CONFIG_ACPI || CONFIG_OF -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ACPI</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_OF</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_OF</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ACPI</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- EXT4 requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_EXT4_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_EXT4_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- F2FS requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_F2FS_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_F2FS_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
diff --git a/s/android-5.10/android-recommended-arm.config b/s/android-5.10/android-recommended-arm.config
deleted file mode 100644
index 1ff0342..0000000
--- a/s/android-5.10/android-recommended-arm.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_NEON=y
diff --git a/s/android-5.10/android-recommended-arm64.config b/s/android-5.10/android-recommended-arm64.config
deleted file mode 100644
index 16ec836..0000000
--- a/s/android-5.10/android-recommended-arm64.config
+++ /dev/null
@@ -1,7 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_CRYPTO=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/s/android-5.10/android-recommended-x86.config b/s/android-5.10/android-recommended-x86.config
deleted file mode 100644
index 0388b3f..0000000
--- a/s/android-5.10/android-recommended-x86.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/s/android-5.10/android-recommended.config b/s/android-5.10/android-recommended.config
deleted file mode 100644
index de28508..0000000
--- a/s/android-5.10/android-recommended.config
+++ /dev/null
@@ -1,131 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KSM is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_VT is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_COMPACTION=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_COREDUMP=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_DM_BOW=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_ELF_CORE=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_FTRACE=y
-CONFIG_GREENASIA_FF=y
-CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_ACRUX=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_EMS_FF=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_HOLTEK=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KEYTOUCH=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PRIMAX=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SAITEK=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SPEEDLINK=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WALTOP=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEYS=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MSDOS_FS=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_OVERLAY_FS=y
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PSI=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_RAM=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SDCARD_FS=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMP=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_TABLET_USB_ACECAD=y
-CONFIG_TABLET_USB_AIPTEK=y
-CONFIG_TABLET_USB_GTCO=y
-CONFIG_TABLET_USB_HANWANG=y
-CONFIG_TABLET_USB_KBTAB=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_TASK_GROUP=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_VFAT_FS=y
diff --git a/s/android-5.10/non_debuggable.config b/s/android-5.10/non_debuggable.config
deleted file mode 100644
index 862fbff..0000000
--- a/s/android-5.10/non_debuggable.config
+++ /dev/null
@@ -1 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
diff --git a/s/android-5.4/android-base-conditional.xml b/s/android-5.4/android-base-conditional.xml
deleted file mode 100644
index 1e62abd..0000000
--- a/s/android-5.4/android-base-conditional.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<kernel minlts="5.4.86" />
-
-<!-- KEEP ALPHABETICALLY SORTED -->
-<!-- ARM base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_AEABI</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CPU_SW_DOMAIN_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_OABI_COMPAT</key>
-		<value type="bool">n</value>
-	</config>
-</group>
-
-<!-- ARM64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ARM64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ARM64_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARM64_SW_TTBR0_PAN</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_ARMV8_DEPRECATED</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_COMPAT</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_CP15_BARRIER_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SETEND_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SHADOW_CALL_STACK</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_SWP_EMULATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_DEVKMEM</key>
-		<value type="bool">n</value>
-	</config>
-	<config>
-		<key>CONFIG_PAGE_TABLE_ISOLATION</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_RETPOLINE</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PMD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_HAVE_MOVE_PUD</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_USERFAULTFD</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- x86_64 base requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_X86_64</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_CFI_CLANG</key>
-		<value type="bool">y</value>
-	</config>
-	<config>
-		<key>CONFIG_BPF_JIT_ALWAYS_ON</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- CONFIG_ACPI || CONFIG_OF -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_ACPI</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_OF</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_OF</key>
-			<value type="bool">n</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_ACPI</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- EXT4 requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_EXT4_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_EXT4_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
-
-<!-- F2FS requirements -->
-<group>
-	<conditions>
-		<config>
-			<key>CONFIG_F2FS_FS</key>
-			<value type="bool">y</value>
-		</config>
-	</conditions>
-	<config>
-		<key>CONFIG_F2FS_FS_POSIX_ACL</key>
-		<value type="bool">y</value>
-	</config>
-</group>
diff --git a/s/android-5.4/android-recommended-arm.config b/s/android-5.4/android-recommended-arm.config
deleted file mode 100644
index 1ff0342..0000000
--- a/s/android-5.4/android-recommended-arm.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM_CE=y
-CONFIG_CRYPTO_SHA2_ARM_CE=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_NEON=y
diff --git a/s/android-5.4/android-recommended-arm64.config b/s/android-5.4/android-recommended-arm64.config
deleted file mode 100644
index 755dfc3..0000000
--- a/s/android-5.4/android-recommended-arm64.config
+++ /dev/null
@@ -1,8 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_ARM64_CRYPTO=y
-CONFIG_ARM64_SW_TTBR0_PAN=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_KFENCE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/s/android-5.4/android-recommended-x86.config b/s/android-5.4/android-recommended-x86.config
deleted file mode 100644
index fe497f2..0000000
--- a/s/android-5.4/android-recommended-x86.config
+++ /dev/null
@@ -1,6 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_SHA256_SSSE3=y
-CONFIG_KFENCE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RELOCATABLE=y
diff --git a/s/android-5.4/android-recommended.config b/s/android-5.4/android-recommended.config
deleted file mode 100644
index de28508..0000000
--- a/s/android-5.4/android-recommended.config
+++ /dev/null
@@ -1,131 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KSM is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_VT is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_COMPACTION=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_COREDUMP=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_DM_BOW=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DRAGONRISE_FF=y
-CONFIG_ELF_CORE=y
-CONFIG_ENABLE_DEFAULT_TRACERS=y
-CONFIG_ENERGY_MODEL=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_SECURITY=y
-CONFIG_FTRACE=y
-CONFIG_GREENASIA_FF=y
-CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=y
-CONFIG_HID_ACRUX=y
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_ELECOM=y
-CONFIG_HID_EMS_FF=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_HOLTEK=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_KEYTOUCH=y
-CONFIG_HID_KYE=y
-CONFIG_HID_LCPOWER=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MAGICMOUSE=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_MULTITOUCH=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_PICOLCD=y
-CONFIG_HID_PRIMAX=y
-CONFIG_HID_PRODIKEYS=y
-CONFIG_HID_ROCCAT=y
-CONFIG_HID_SAITEK=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_SPEEDLINK=y
-CONFIG_HID_STEAM=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_TIVO=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_UCLOGIC=y
-CONFIG_HID_WACOM=y
-CONFIG_HID_WALTOP=y
-CONFIG_HID_WIIMOTE=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_HID_ZYDACRON=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TABLET=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_ION=y
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KEYS=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGITECH_FF=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_MSDOS_FS=y
-CONFIG_NET_SCH_NETEM=y
-CONFIG_OVERLAY_FS=y
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_PANTHERLORD_FF=y
-CONFIG_PERF_EVENTS=y
-CONFIG_PM_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PSI=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_CONSOLE=y
-CONFIG_PSTORE_RAM=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_SCHEDSTATS=y
-CONFIG_SDCARD_FS=y
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_SMP=y
-CONFIG_SND=y
-CONFIG_SOUND=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_TABLET_USB_ACECAD=y
-CONFIG_TABLET_USB_AIPTEK=y
-CONFIG_TABLET_USB_GTCO=y
-CONFIG_TABLET_USB_HANWANG=y
-CONFIG_TABLET_USB_KBTAB=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_TASK_GROUP=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_RTL8152=y
-CONFIG_USB_USBNET=y
-CONFIG_VFAT_FS=y
diff --git a/s/android-5.4/non_debuggable.config b/s/android-5.4/non_debuggable.config
deleted file mode 100644
index 862fbff..0000000
--- a/s/android-5.4/non_debuggable.config
+++ /dev/null
@@ -1 +0,0 @@
-#  KEEP ALPHABETICALLY SORTED
diff --git a/tools/Android.bp b/tools/Android.bp
index 93aa598..3148688 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -1,12 +1,3 @@
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "kernel_configs_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["kernel_configs_license"],
-}
-
 python_binary_host {
     name: "kconfig_xml_fixup",
     main: "kconfig_xml_fixup.py",