Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."