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

Change-Id: I273341a60900a6b2fdebcb0bae19c40a526b8b9f