Merge "Reland "Add symlink for toybox tar."" am: b0c1b27fe5
am: b4ca831f12

Change-Id: Ib5f425cc55f3fba6bc21672a0e71a45c380bc186