ee61acdc53
Merge commit '8b854e0d59512004028f96a93016e614c7df478a' into eclair-plus-aosp * commit '8b854e0d59512004028f96a93016e614c7df478a': Fix build.