Merge commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2' into eclair-mr2-plus-aosp * commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2': Fixing the build.
Merge commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2' into eclair-mr2-plus-aosp * commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2': Fixing the build.