am 4ee93666: am e4260f4e: Fix build.

Merge commit '4ee936667181975cd755acd81c653ba686d6106d' into eclair-mr2-plus-aosp

* commit '4ee936667181975cd755acd81c653ba686d6106d':
  Fix build.