deb: Revert some init changes to fix device encryption

Something here is preventing framework from restarting
properly which breaks device encryption.  Revert for now
as some of this may be candidates for Flo merging anyway.

Change-Id: I2a9b4c3c27e9ca8b8de57c487f3a59a50da0ec0f
deb: Add props for hardware-backed keystore.msm8960

Change-Id: I9824487e67a054d7a68c479f9c2bf2b0e4a4441c
deb: Fix telephony APNs

Include telephony.mk since gsm.mk is now empty

Change-Id: I29d3c03d12584cb372d16ef5788b7daa703cf117
Merge "deb: Add props for hardware-backed keystore.msm8960" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2