Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."