Build fix.
Merge remote-tracking branch 'cyanogen/gingerbread' into gingerbread