Merge commit '31a0b956396e417bdbfee97554afb5b52d68a8ba' * commit '31a0b956396e417bdbfee97554afb5b52d68a8ba': Add stdint.h to fix sim-eng
Merge commit '31a0b956396e417bdbfee97554afb5b52d68a8ba' * commit '31a0b956396e417bdbfee97554afb5b52d68a8ba': Add stdint.h to fix sim-eng