update to new apns config

and cleanup

Change-Id: Icc8c4c2e92ee769ea1907513daa37d86c3899066
Merge "update to new apns config" into android-4.4