(cherry picked from commit a7389203)

Conflicts:
	odk/examples/cpp/complextoolbarcontrols/Makefile

Change-Id: I28af30dc04068c670d31be7494b7ce9a7a25c3a3