am 7a72f848: am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__

Merge commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911'

* commit '7a72f84801c3ad74f00f5d3d0da7e2212d07a911':
  Fix simulator build