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

Change-Id: Id4001bcf32c5a905d2d3d6805925532de30ce382