am 639b823b: Merge "Fix build." into eclair

Merge commit '639b823b287211a67e525238c5f2f4e2a9ebc0c6' into eclair-plus-aosp

* commit '639b823b287211a67e525238c5f2f4e2a9ebc0c6':
  Fix build.
tree: d28652020aba47e3d958f3afc8e9b168a641fe45
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk