Merge "Switch from getrlimit(RLIMIT_AS) to android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES)." am: e3a7f1b680
am: e8fde3739f

Change-Id: Iaa82a564793437bbf6ac73435469072e533bdaf4