Merge changes from topic "atrace_thermal"

* changes:
  atrace: add thermal trace to user build
  Add thermal category to atrace.