Merge "Fix no-prebuild failure."