Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp * commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd': Fix broken build.
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp * commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd': Fix broken build.