Merge "Include stdlib to fix sim build"