Merge "Revert "Add a --toybox-path option to the art script.""
am: 2e366a14d9

Change-Id: I23e483858498e9defe048508953457bf9068fc67