Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f am: 15d565bbca am: b664dd38b9 am: df5ecefde4
am: f398e4a6d8

Change-Id: I75f556bb64fdfc9610fc133c969bc5411906fc2a