Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo