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

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