Merge "Add ion/ion_stat to the atrace memory category" am: 1a4d480a77 am: bccee21178

Change-Id: I593cba20a668bbe40d238b76fb853a4b807bd7b5