Revert "Test Carbon dalvik"

This reverts commit 0ec0e30f503b2508243e81b4ec15de9e7007d376.

Conflicts:
	default.xml