Merge "Fix build."
tree: 608e735ae72729af7c4f8a294d2eeeb36ed23633
  1. mockril/
  2. src/
  3. tests/
  4. Android.mk
  5. CleanSpec.mk