am 9199e723: Merge "Fix compiling breakage (SIGSEGV) from doing "make -jN", where N > 1." into ics-mr1-plus-art

* commit '9199e7237615d31d943941f2b27c6f7709d88c05':
  Fix compiling breakage (SIGSEGV) from doing "make -jN", where N > 1.
tree: 80d131cdf718468c744ba618ce8a2e58f76cf174
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk