Merge "Revert "Revert "Add symlink for toybox timeout."""
am: 095c47e7ce

Change-Id: I34604c1a4dc9bde0759c566c65e1a360118259cd