Merge "Add four memory events to atrace.rc" am: cde4890db4 am: 9d010bee5b
am: c2f6dd8ccc

Change-Id: I6fa93226469411f327eba090e874acef5f1a4fee