Merge "Rewrite the clean steps for TARGET_2ND_ARCH."