Merge "cutils: trace: add atrace_update_tags()"