Merge "Add four memory events to atrace.rc"