clean up wimax 2/3
Merge branch 'master' of https://github.com/BlakKatRom/platform_frameworks_opt_telephony