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

Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build
tree: c7cb30e70c745bc2952fbafe2ccc5efae216fb43
  1. camera/
  2. cmds/
  3. include/
  4. media/