Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp * commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df': Fix sdk build.
Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp * commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df': Fix sdk build.