Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."