Revert "ERROR"

This reverts commit 7f0475ec0383e9685513ecd4636062631ef5fa52.

Conflicts:
	tests/Android.mk