Merge "Use junit-host instead of junit" am: eafda48599
am: 4d0a75dc75

Change-Id: I27ca922115b308935d6f6482c34099496cdfd9a0
tree: 0a1bac425c978a143eac99f3ab5ce0bf1e729073
  1. src/
  2. tests/
  3. .classpath
  4. .gitignore
  5. .project
  6. Android.mk