Merge commit '0d23b82be2176e4beaa462bd50ff577819651b87' into eclair-plus-aosp * commit '0d23b82be2176e4beaa462bd50ff577819651b87': Fix $#%^&%!! SDK build.
Merge commit '0d23b82be2176e4beaa462bd50ff577819651b87' into eclair-plus-aosp * commit '0d23b82be2176e4beaa462bd50ff577819651b87': Fix $#%^&%!! SDK build.