Merge "Assembler fix" into dalvik-dev
tree: ba568c88e0a2a0b9d4c92bdede1cd8274c191694
  1. build/
  2. src/
  3. test/
  4. tools/
  5. Android.mk