Merge commit '15b9de8cf217c315acb57044c43a9b12da57b6c4' into eclair-mr2-plus-aosp * commit '15b9de8cf217c315acb57044c43a9b12da57b6c4': Fix the build
Merge commit '15b9de8cf217c315acb57044c43a9b12da57b6c4' into eclair-mr2-plus-aosp * commit '15b9de8cf217c315acb57044c43a9b12da57b6c4': Fix the build