In order to update the mobility apk for ohmage 2.15 and maintain backwards compatibility to 2.14.

This reverts commit 8fa370ebc7b9a2ee8e1610ca456c00e1c43d1a5d.

Conflicts:
	AndroidManifest.xml
	src/org/ohmage/mobility/MobilityDbAdapter.java