(cherry picked from commit 65ef7b5d)

Conflicts:
	odk/settings/std.mk

Change-Id: I73e62097456ab8dbe601f557a4f5b65f9b7aba6b