am 9ddb7df8: Fix build.

Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-plus-aosp

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.
tree: df89b30b491832626dca45d536ad23bf40c43872
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE