Merge "Fix build-art-target and build-art-host rules."