Merge "Add rss_stat, ion_heap_grow, ion_heap_shrink to atrace.rc"