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

Change-Id: I2874a696c857d35c4755f757a949f4710439bd7b