Merge "Fix AtraceHostTest to not rely on parsing tgid" into mnc-dev