Merge "atrace.rc: move to post-fs trigger"