Merge "Remove art-* targets in favor of build-art-* targets."