[automerger skipped] Merge "Detach pollThread only if it is joinable" into pie-vts-dev am: cf4a2880c9 am: 7a2b3edec5 -s ours
am: d89fab7c34

Change-Id: I380efdd019c8bf10a3681fe7de5b6e347e316690