Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp * commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70': Try to fix sdk build again.
Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp * commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70': Try to fix sdk build again.