Merge "Use ln(1) rather than cp(1) to set up host /system for testing."