Revert "ANDROID: mm: Set PAGE_BLOCK_ORDER to 7 when ARM64_16K_PAGES"

This reverts commit 45afa56280.

Reason for revert: This was a workaround due to the kernel build
tools preserving the # nocheck comment as part of the config option
for CONFIG_PAGE_BLOCK_ORDER, which is problematic, since it is
supposed to be an int. The build tools have been patched to not
do that anymore, so this can be removed.

Bug: 424212284
Bug: 375647879
Bug: 355449177
Bug: 418282543
Change-Id: Ib999aea150c1c5f7f22ea6bdd81de0ec75f8efaf
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>

mm/Kconfig

@@ -1001,13 +1001,6 @@ config CMA_AREAS
 config ARCH_FORCE_MAX_ORDER
 	int
 
-#
-# Select this config option from the ARM64 architecture Kconfig to set
-# the page size to 16KB.
-# See b/424212284 for more information.
-config ARM64_16K_PAGES
-	bool
-
 #
 # When ARCH_FORCE_MAX_ORDER is not defined,
 # the default page block order is MAX_PAGE_ORDER (10) as per
@@ -1017,7 +1010,6 @@ config PAGE_BLOCK_ORDER
 	int "Page Block Order"
 	range 1 10 if ARCH_FORCE_MAX_ORDER = 0 || ARCH_FORCE_MAX_ORDER = ""
 	default 10 if ARCH_FORCE_MAX_ORDER = 0 || ARCH_FORCE_MAX_ORDER = ""
-	default 7 if ARM64_16K_PAGES
 	range 1 ARCH_FORCE_MAX_ORDER if ARCH_FORCE_MAX_ORDER != 0
 	default ARCH_FORCE_MAX_ORDER if ARCH_FORCE_MAX_ORDER != 0
 	help