Merge changes Iee2984f7,I18a3fd8a

* changes:
  Fix logic error in atrace when detecting available categories.
  Add several more tracepoints to the memory category in atrace