Merge "Add Memory category to atrace." am: 09a8db1080
am: 6f6719826d

Change-Id: I5a067900e560c3a1b205741a34b9cef19857af5a