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

Change-Id: Iebf2d3828dd84ba648ea81a659359e3e751092b0