diff --git a/MBL/Project/mbl_afterbuild.sh b/MBL/Project/mbl_afterbuild.sh
index 462f712..58b3d0c 100755
--- a/MBL/Project/mbl_afterbuild.sh
+++ b/MBL/Project/mbl_afterbuild.sh
@@ -37,4 +37,3 @@ fi
 cp ${OUTPUT_PATH}/../${OUTPUT_NAME}.bin ${OUTPUT_IMAGE_PATH}
 # Generate Hex file
 ${SREC_CAT}  ${OUTPUT_IMAGE_PATH}/${OUTPUT_NAME}.bin -Binary -offset 0x0C000000 -o ${OUTPUT_IMAGE_PATH}/${OUTPUT_NAME}.hex -Intel
-
diff --git a/build/core/combo/TARGET_linux-arm.mk b/build/core/combo/TARGET_linux-arm.mk
index df81cd5..8cdd3ab 100644
--- a/build/core/combo/TARGET_linux-arm.mk
+++ b/build/core/combo/TARGET_linux-arm.mk
@@ -38,7 +38,7 @@ endif
 $(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8
 
 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
-$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
+$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 9.0
 else
 $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif
diff --git a/build/core/config.mk b/build/core/config.mk
index 41bf2ca..ef2d218 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -457,9 +457,9 @@ endif
 
 # Is the host JDK 64-bit version?
 HOST_JDK_IS_64BIT_VERSION :=
-ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
-HOST_JDK_IS_64BIT_VERSION := true
-endif
+#ifneq ($(filter 64-Bit, $(shell java -version 2>&1)),)
+#HOST_JDK_IS_64BIT_VERSION := true
+#endif
 
 # It's called md5 on Mac OS and md5sum on Linux
 ifeq ($(HOST_OS),darwin)
diff --git a/build/envsetup.sh b/build/envsetup.sh
index b4fb0a5..1961357 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -157,7 +157,7 @@ function setpaths()
     case $ARCH in
         arm)
             # Legacy toolchain configuration used for ARM kernel compilation
-            toolchaindir=arm/arm-eabi-$targetgccversion/bin
+            toolchaindir=arm/arm-none-eabi-$targetgccversion/bin
             if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
                  export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"
                  ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":
diff --git a/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8 b/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8
deleted file mode 120000
index c55ffd6..0000000
--- a/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8
+++ /dev/null
@@ -1 +0,0 @@
-/opt/toolchains/gcc-arm-none-eabi/
\ No newline at end of file
diff --git a/prebuilts/gcc/linux-x86/arm/arm-none-eabi-9.0 b/prebuilts/gcc/linux-x86/arm/arm-none-eabi-9.0
new file mode 120000
index 0000000..245c962
--- /dev/null
+++ b/prebuilts/gcc/linux-x86/arm/arm-none-eabi-9.0
@@ -0,0 +1 @@
+/opt/toolchains/gcc-arm-none-eabi-9-2020-q2-update
\ No newline at end of file