Merge "Disable two tests for no-prebuild."