Merge "Add a --toybox-path option to the art script."
am: 281c12dfca

Change-Id: I2ba192ffa99045dbd18570c24cc4f206d4234a33