Merge "Add fix and add some debugging." into jb-mr2-dev
tree: f11150aa8cf8cbd1b62ac49c4fd6f62379dbba96
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt