Merge "fix pagecache category in atrace_userdebug"