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

Change-Id: I45aefbce8acc484d63a24feda9b7fd84506f3339