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

Change-Id: I4b4349a63cf6b13249a1acf4992f33fac7eadcaf