am 22c3bbde: Merge "Fix build."

* commit '22c3bbde1128029c4d4e6fe34ee0b56f530629ac':
  Fix build.
tree: 43a6be210816db45aac41a90cb88e79aaf2a6ead
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk