Merge "Add an option to the art script to not cleanup." am: 69223111c0 am: 9e9affad63
am: 4e52c245cc

Change-Id: I7ac1332c9284b8ea7cf77863233e4ad1a3071f0e