merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 4b690d0c799f7de3dee697e159b23c3c0e4e4504
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk