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

Change-Id: I27605565fbbf5b07939c8df4a686ea25bcb62669