Motox dalvik patch

Conflicts:
	device-common.mk

Change-Id: Ie692cb6b9f94b291d4c34359c79f345aca4823f2