Merge commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937' into eclair-plus-aosp * commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937': Fix build.