Merge "Fix reference to out of scope local in adb_thread_setname." am: b31ca1a64f am: e4c569c310
am: 87e96c22bc

Change-Id: Id2d91a34d11400cdb4b601da745d64209aeb3e71