Merge "Updating ATRACE_ASYNC_FOR_TRACK_END to not require a name argument"