Merge "bionic, libthread_db x86 fixes"