fixed build errors

Change-Id: I896e6d83529c9d759f400e7fdbe1b336487b0813
Merge branch 'gingerbread' of git://github.com/TeamFun/android_packages_apps_CMParts into gingerbread