diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92cf0e3..d5902e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (android-tools)
+project(android-tools)
 cmake_minimum_required(VERSION 3.1.0)
 
 # Android provides it's own version of mke2fs which is incompatible with
@@ -11,8 +11,8 @@ set(ANDROID_MKE2FS_NAME "mke2fs.android")
 
 # Version of android-tools and the version of boringssl being used.
 # See: https://android.googlesource.com/platform/external/boringssl/+/android-${ANDROID_VERSION}/BORINGSSL_REVISION
-set(ANDROID_VERSION 8.1.0_r33)
-set(BORINGSSL_VERSION 14308731e5446a73ac2258688a9688b524483cb6)
+set(ANDROID_VERSION 9.0.0_r3)
+set(BORINGSSL_VERSION 45210dd4e21ace9d28cb76b3f83303fcdd2efcce)
 
 # The CMakeLists.txt in the vendor subdirectory is responsible for
 # patching, building and installing the software.
diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt
index 31a785b..9066579 100644
--- a/vendor/CMakeLists.adb.txt
+++ b/vendor/CMakeLists.adb.txt
@@ -50,17 +50,17 @@ target_include_directories(liblog PUBLIC
 	core/log/include core/include)
 
 add_library(libcutils STATIC
-	core/libcutils/load_file.c
-	core/libcutils/socket_local_client_unix.c
-	core/libcutils/socket_network_client_unix.c
-	core/libcutils/socket_local_server_unix.c
+	core/libcutils/load_file.cpp
+	core/libcutils/socket_local_client_unix.cpp
+	core/libcutils/socket_network_client_unix.cpp
+	core/libcutils/socket_local_server_unix.cpp
 	core/libcutils/sockets_unix.cpp
-	core/libcutils/socket_inaddr_any_server_unix.c
+	core/libcutils/socket_inaddr_any_server_unix.cpp
 	core/libcutils/sockets.cpp
 	core/libcutils/android_get_control_file.cpp
-	core/libcutils/threads.c
+	core/libcutils/threads.cpp
 	core/libcutils/fs_config.cpp
-	core/libcutils/canned_fs_config.c)
+	core/libcutils/canned_fs_config.cpp)
 
 target_compile_definitions(libcutils PRIVATE -D_GNU_SOURCE)
 target_include_directories(libcutils PUBLIC
diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt
index 7a6463e..b4a54d2 100644
--- a/vendor/CMakeLists.fastboot.txt
+++ b/vendor/CMakeLists.fastboot.txt
@@ -9,15 +9,6 @@ add_library(libsparse STATIC
 target_include_directories(libsparse PUBLIC
 	core/libsparse/include core/base/include)
 
-add_library(libf2fs STATIC
-	extras/f2fs_utils/f2fs_utils.c
-	extras/f2fs_utils/f2fs_ioutils.c
-	extras/f2fs_utils/f2fs_dlutils.c)
-
-target_include_directories(libf2fs PUBLIC
-	extras/f2fs_utils f2fs-tools/include f2fs-tools/mkfs
-	core/libsparse/include selinux/libselinux/include)
-
 add_library(libzip STATIC
 	core/libziparchive/zip_archive.cc)
 
@@ -31,16 +22,8 @@ target_include_directories(libutil PUBLIC
 	core/include)
 
 add_library(libext4 STATIC
-	extras/ext4_utils/make_ext4fs.c
-	extras/ext4_utils/ext4fixup.c
 	extras/ext4_utils/ext4_utils.c
-	extras/ext4_utils/allocate.c
-	extras/ext4_utils/contents.c
-	extras/ext4_utils/extent.c
-	extras/ext4_utils/indirect.c
-	extras/ext4_utils/sha1.c
 	extras/ext4_utils/wipe.c
-	extras/ext4_utils/crc16.c
 	extras/ext4_utils/ext4_sb.c)
 
 target_include_directories(libext4 PUBLIC
@@ -122,12 +105,12 @@ add_executable(fastboot
 
 target_include_directories(fastboot PRIVATE
 	core/base/include core/include core/adb core/libsparse/include
-	core/mkbootimg extras/ext4_utils/include extras/f2fs_utils
-	core/libziparchive/include)
+	extras/ext4_utils/include extras/f2fs_utils
+	core/libziparchive/include core/mkbootimg/include/bootimg)
 target_compile_definitions(fastboot PRIVATE
 	-D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS
 	-DANDROID_MKE2FS_NAME="${ANDROID_MKE2FS_NAME}")
 target_link_libraries(fastboot
 	libsparse libzip libcutils liblog libutil libbase libext4
-	libf2fs libselinux libsepol libdiagnoseusb
+	libselinux libsepol libdiagnoseusb
 	z pcre2-8 pthread dl)
diff --git a/vendor/CMakeLists.mke2fs.txt b/vendor/CMakeLists.mke2fs.txt
index b853508..6163ce3 100644
--- a/vendor/CMakeLists.mke2fs.txt
+++ b/vendor/CMakeLists.mke2fs.txt
@@ -51,6 +51,7 @@ add_library(libext2fs STATIC
 	e2fsprogs/lib/ext2fs/get_num_dirs.c
 	e2fsprogs/lib/ext2fs/getsectsize.c
 	e2fsprogs/lib/ext2fs/getsize.c
+	e2fsprogs/lib/ext2fs/hashmap.c
 	e2fsprogs/lib/ext2fs/i_block.c
 	e2fsprogs/lib/ext2fs/ind_block.c
 	e2fsprogs/lib/ext2fs/initialize.c
@@ -75,6 +76,7 @@ add_library(libext2fs STATIC
 	e2fsprogs/lib/ext2fs/read_bb_file.c
 	e2fsprogs/lib/ext2fs/res_gdt.c
 	e2fsprogs/lib/ext2fs/rw_bitmaps.c
+	e2fsprogs/lib/ext2fs/sha512.c
 	e2fsprogs/lib/ext2fs/sparse_io.c
 	e2fsprogs/lib/ext2fs/symlink.c
 	e2fsprogs/lib/ext2fs/undo_io.c
@@ -98,7 +100,7 @@ add_library(libext2fs STATIC
 	e2fsprogs/misc/create_inode.c)
 
 target_include_directories(libext2fs PRIVATE
-	e2fsprogs/lib core/libsparse/include)
+	e2fsprogs/lib e2fsprogs/lib/ext2fs core/libsparse/include)
 
 add_executable("${ANDROID_MKE2FS_NAME}"
 	e2fsprogs/misc/default_profile.c