Merge "Fix reference to out of scope local in adb_thread_setname."