Merge commit 'e3cfe2d92868513c9524804a362c3c3c8b8cc4e5' into eclair-mr2-plus-aosp * commit 'e3cfe2d92868513c9524804a362c3c3c8b8cc4e5': Fix the SDK build.