Merge "Add mm_event trace events to the atrace 'memory' category" am: caeafbfce3 am: d9feea395f

Change-Id: I46fce519ef663b89bd84a0e54bf24e315cb63fdf