Merge "Add mm_event trace events to the atrace 'memory' category" into rvc-dev