Merge "Add stdint.h to fix sim-eng" into gingerbread