Merge "Tweak native allocation GC triggering thresholds" am: e959e5d54e
am: 01c5af1960

Change-Id: I2b9fa300f9279ab6df029e757ffd6499b26439f6