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