follow framework changes
Merge branch 'gingerbread' of github.com:CyanMobile/android_build_cyanmobile into gingerbread
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread