Merge "Fix some broken tests."
tree: 8551148c38fd0a06dfb627587dfcfb424d6e4bb9
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk