Merge "Fix libthread_db linkage"