Merge "Don't try to run Thumb 2 code on x86 hosts." into dalvik-dev
tree: c815fcda11d2f47dc64f1fbb7ed1e73ec567be0d
  1. build/
  2. src/
  3. test/
  4. tools/
  5. Android.mk