Merge "Revert "Add a --toybox-path option to the art script.""