Merge "Fix sim-eng build."