Merge "x86_64: Fix bionic tests build-and-run"