Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp * commit '81f339bcfeee5dccb284cdeac6941179f91fe08b': Fixing the build.
Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp * commit '81f339bcfeee5dccb284cdeac6941179f91fe08b': Fixing the build.