Merge "Factor out the waiting for children in bionic tests."