Merge "Only include test targets if test-art* or build-art* is being built."