Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp * commit '23392a84bcb961d3fd50142ec40ce6ac6db89018': Fix the build.
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp * commit '23392a84bcb961d3fd50142ec40ce6ac6db89018': Fix the build.