Merge "Differentiate between native alloc and normal background GC" am: e4e7d601ef am: 197bc62104
am: 6151e7e486

Change-Id: Ic037865d566175a59edc613fd40c73336c86b325