am 7d2795c8: Really fix the build.

Merge commit '7d2795c80c70d5eec67da7848ab1aa8deba538e4' into eclair-plus-aosp

* commit '7d2795c80c70d5eec67da7848ab1aa8deba538e4':
  Really fix the build.