Merge "Switch to toybox tar."
am: 9b74dfe96c

Change-Id: If7aa3f065d4a93d516c2d80b931d5278c311cb8c