Separate AOSP & AOKP db upgrades

Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>

Conflicts:

	src/com/android/providers/contacts/ContactsDatabaseHelper.java

Change-Id: I91424d96de91e84fd671c2170ff446714974f535