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