am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."

* commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.