Merge "Revert "Revert "Add symlink for toybox timeout.""" am: 095c47e7ce am: 6893f70c53
am: 51908cc765

Change-Id: I9ff966a413c75a6d9314ca44cae1d09b2b02e2e2