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

Change-Id: I7a55b7746b9793edc51be9a7e1329ac17d1c24e1