Merge "Workaround for bionic libs and linker now being in bootstrap."