am 6353fe2f: am 2a3cc744: Merge "Set SYSTEM_PAGE_SIZE from PAGE_SHIFT"

* commit '6353fe2fbb380551a576fb38ad68dbc1566d250c':
  Set SYSTEM_PAGE_SIZE from PAGE_SHIFT