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

Change-Id: Ibb3694aa20648a1313b8e9de9a2f56628b863365