Add wait3 and wait4 back in for bionic.
Add wait3 and wait4 back in for bionic.

Previously disable them, but we just need to change their signature.

BUG=None
TEST=trybots
R=sbc@chromium.org

Review URL: https://codereview.chromium.org/654033002

yeyus/naclports,dtkav/naclports,Schibum/naclports,dtkav/naclports,Schibum/naclports,yeyus/naclports,Schibum/naclports,yeyus/naclports,Schibum/naclports,Schibum/naclports,Schibum/naclports,dtkav/naclports,yeyus/naclports,kuscsik/naclports,kuscsik/naclports,kuscsik/naclports,dtkav/naclports,yeyus/naclports,yeyus/naclports,kuscsik/naclports,dtkav/naclports,kuscsik/naclports