Merge "Add rss_stat, ion_heap_grow, ion_heap_shrink to atrace.rc" am: 900902132e am: 822ea22987
am: e61e4cc204

Change-Id: I6a7b22f505156911a672e81cffa73d920e7117d9