am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c2e35f33ae6a31d4420672ad4dad46ca297c0db7':
tree: 3ed5f81bb962df0a6295dfc59801180be0ee5732
  1. Android.mk
  2. CleanSpec.mk
  3. mockril/
  4. src/
  5. tests/