Merge "Set SYSTEM_PAGE_SIZE from PAGE_SHIFT"