RIL: Remove GPRS>EDGE override to prevent breakage on qcril merge

Change-Id: I8a6a11f92d7aefd7ea4d17f1fde8749426df4a18
root: Update wlan config for p2p/wifi direct

Change-Id: If9e960e4e9259b08e4e066c27701bc39a27067e7
proprietary-files: Remove hostapd_default.conf

Change-Id: Id502088ee8bfd206ac3cac5a15905dc310bffadf
Move TARGET_DISPLAY_INSECURE_MM_HEAP to qcom-common

Change-Id: Ic4d41811237635aa82825258fff4ba00c3beac73
Merge remote-tracking branch 'cm/cm-10.2' into jb-mr2

Conflicts:
	rootdir/etc/init.qcom.rc

Change-Id: Idd05ff217c668b9aea48f7a687c5d162ee447072