Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I2ca40701356e0a6f1adc4d95621c6043082c0544
tree: 179a0608e444e8b009ee3a78ad115c44e47440bd
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk