Merge commit '4874dcd417d7a07a8e802709c5d6895dc408d422' into eclair-mr2-plus-aosp * commit '4874dcd417d7a07a8e802709c5d6895dc408d422': fix build
Merge commit '4874dcd417d7a07a8e802709c5d6895dc408d422' into eclair-mr2-plus-aosp * commit '4874dcd417d7a07a8e802709c5d6895dc408d422': fix build