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

Change-Id: I7351448d18d175469d68f6eee95025285e8a3553