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

Change-Id: I19fc5b3038a09cc096cc272e2c53343cc80f66ae