0ae6d2e826
Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64' * commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64': Fix the simulator build.