am 236e7906: am e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev

* commit '236e790608aa3d60630d3946f54fb9a3ae01b19f':
  atrace: make fs-specific sysfs entries optional