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

Change-Id: I52334126a054ab5aacf97ede1c8255d22aa40622