Merge "Disable test-660 for no-prebuild"