Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev