3ce6563320
Merge commit 'c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp * commit 'c6ecccb284401b6312108f927ffcfc303872f380': Fix the build.