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

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