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