Settings: Build OmniGears as part of Settings APK

Conflicts:
	Android.mk

Change-Id: Ie472f1f21fa5bc3edf89da405da6e100ba79ecb1