Merge "Add ion/ion_stat to the atrace memory category"