diff --git a/LICENSE b/LICENSE
index e7709d25..3e2d4cab 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,21 +2,30 @@ Below are the license mappings for all of the files found in this repository.
 All attempts have been made to ensure accuracy of the corresponding license files.
 If you've found an issue please file an issue or pull request.
 
-Manifests - GPL-3.0-or-later
-Misc - GPL-3.0-or-later
+Checklists/ - GPL-3.0-or-later
+Manifests/ - GPL-3.0-or-later
+Misc/
+	aosp-cves/ - Apache-2.0
+	pubring.kbx - non-copyrightable?
+	[Everything Else] - GPL-3.0-or-later
 Patches/
 	Common/
-		android_vendor_divested - GPL-3.0-or-later
-			default_wallpaper.png - Unsplash, Pawel Czerwinski
+		android_external_hardened_malloc - MIT
 		android_kernel_* - GPL-2.0-only
+		android_vendor_divested/
+			default_wallpaper.png - Unsplash, Pawel Czerwinski
+			mms_config.xml - Google
+			vvm_config.xml - Google
+			[Everything Else] - GPL-3.0-or-later
 		wireless-regdb - See LICENSE included (ISC)
 		[Everything Else] - Apache-2.0
 	LineageOS-*/
+		android_external_hardened_malloc - MIT
 		android_kernel_* - GPL-2.0-only
 		[Everything Else] - Apache-2.0
-	Linux - See COPYING included (GPL-2.0-only)
-	Wallpapers - See LICENSE included (Unsplash)
-PrebuiltApps - See LICENSE included
-Scripts - GPL-3.0-or-later
+	Linux/ - See COPYING included (GPL-2.0-only)
+	Wallpapers/ - See LICENSE included (Unsplash)
+PrebuiltApps/ - See LICENSE included
+Scripts/ - GPL-3.0-or-later
 
 Please see the included LICENSE.* files for the corresponding full license texts.
diff --git a/PrebuiltApps b/PrebuiltApps
index 8f968972..17053cb7 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 8f968972b5786251e83b58ff23baf2c5fd615699
+Subproject commit 17053cb765e0f0b5cfd292df2c9e53b2ec8a115e
diff --git a/Scripts/Generate_Verified_Boot_Hashes.sh b/Scripts/Generate_Verified_Boot_Hashes.sh
index 4095c5f7..f9897a40 100644
--- a/Scripts/Generate_Verified_Boot_Hashes.sh
+++ b/Scripts/Generate_Verified_Boot_Hashes.sh
@@ -18,7 +18,7 @@ umask 0022;
 set -uo pipefail;
 
 #grep "verity\.mk" Build/*/device/*/*/*.mk -l
-VERITY_DEVICES=('Amber' 'angler' 'bullhead' 'cheeseburger' 'cheryl' 'discover' 'dragon' 'dumpling' 'flounder' 'marlin' 'mata' 'oneplus3' 'pioneer' 'sailfish' 'shamu' 'voyager' 'z2_plus');
+VERITY_DEVICES=('Amber' 'angler' 'bullhead' 'cheeseburger' 'cheryl' 'discovery' 'dragon' 'dumpling' 'flounder' 'marlin' 'mata' 'oneplus3' 'pioneer' 'sailfish' 'shamu' 'voyager' 'z2_plus');
 #grep "AVB_ENABLE" Build/*/device/*/*/*.mk -l
 AVB_DEVICES=('akari' 'alioth' 'aura' 'aurora' 'avicii' 'barbet' 'beryllium' 'bluejay' 'blueline' 'bonito' 'bramble' 'cheetah' 'coral' 'crosshatch' 'davinci' 'enchilada' 'fajita' 'flame' 'FP3' 'FP4' 'guacamole' 'guacamoleb' 'hotdog' 'hotdogb' 'instantnoodle' 'instantnoodlep' 'kebab' 'lavender' 'lemonade' 'lemonadep' 'lmi' 'oriole' 'panther' 'pro1' 'raphael' 'raven' 'redfin' 'sargo' 'sunfish' 'taimen' 'vayu' 'walleye' 'xz2c');