Revert "Give the OTA app a new home"

This reverts commit 573ddf6b150eaa8f515578040f237db9c636025d.

Conflicts:
	res/values/liquid_strings.xml
	res/xml/device_info_settings.xml