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