This reverts commit ea3df0c5, and
increases the address limit on non-aarch64 64-bit platforms as well.
RLIMIT_AS problem fixed in a different commit.
Bug: 63141434, 64293803
Test: device boots
(cherry picked from commit abb163f5)
Change-Id: I53ee7cb50bbc0b535923bee8a8c0e2e416a81d41