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
tree: fa3cdc3fc7f4cc608da24e178bfea63c7824f8bb
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE