Merge commit '285f242214d38352b844898edffc8eb336d0c19e' into eclair-plus-aosp * commit '285f242214d38352b844898edffc8eb336d0c19e': Fix broken build.
Merge commit '285f242214d38352b844898edffc8eb336d0c19e' into eclair-plus-aosp * commit '285f242214d38352b844898edffc8eb336d0c19e': Fix broken build.