Remove deprecated recovery version define

Change-Id: I27da89fc9346eb3aa49c90181f5b5f719cc45af3
m7-common: don't show restart dialog on SIM hotswap

Change-Id: Ia89cc90b089a9fce2a767059a1038675bc311fd8

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
Merge pull request #45 from crpalmer/cm-10.2

Tiny cleanup / SIM hotswap
Merge branch 'cm-10.2' into martincz