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

Change-Id: I469c8e413e1931759cc7be7e26bf1b3a03b3510e