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

Change-Id: I4eac585d6c05004edffe69d70d047ccc800422f9