Fix the simulator build on Fountain. Change-Id: I89b05c31595f0a8c3001171957eeeb2fec253c74
3e5e21d4
1772c34e
f7adbe10