Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp * commit '368d796e2e28ecd738362c7a4566cb3eb219ab26': Fix build.
Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp * commit '368d796e2e28ecd738362c7a4566cb3eb219ab26': Fix build.