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

Change-Id: I2d75af5f5dad15fd54deb8484bb0de556bdfd0c8