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

Change-Id: I2d35c40054bd906ed4d10c387d9377654aaee1f4