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