Reconcile with jb-mr1-release - do not merge

Change-Id: Id46c84731699446fa4b89cd27308d2f307c4a81b
tree: e6dc16d8e17d477adc87f64962886063918f281c
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk