Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp * commit '26d4e539676346236082ed1d3eccdf078980b7d5': Fix build.
Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp * commit '26d4e539676346236082ed1d3eccdf078980b7d5': Fix build.