Merge "Use HeapGrowthMultiplier for native allocaitons" am: 1dc1882c72
am: 0d1f56a699

Change-Id: I0ef2d4d27d3e3fbd9072873e30d4009bb34c7570