Merge commit '029074ff0fca198676997c7453cfffa932361081' into eclair-mr2-plus-aosp * commit '029074ff0fca198676997c7453cfffa932361081': fix build
Merge commit '029074ff0fca198676997c7453cfffa932361081' into eclair-mr2-plus-aosp * commit '029074ff0fca198676997c7453cfffa932361081': fix build