Merge "Workaround host bionic libs that are missing DT_RUNPATH"