Applied 4.1.2 Pdroid patches
Following mateorod, moved some of the surrogates from the framework core to the telephony library where they are used
Fixed build problems
Modified PrivacyPhoneProxy to take PhoneBase rather than Phone as its constructor argument, to fix build problem
Merge branch 'cm-10.1' into cm-10.1-pdroid
Moved PrivacyActivityManagerService.java to frameworks/base
Merge branch 'cm-10.1-openpdroid' of git://github.com/wsot/platform_frameworks_opt_telephony into cm-10.1