devices/sample isn't worth maintaining a tracked version of ourselves.

Change-Id: Ib9202aaf96dab411919f0df129a15c3249bf1dda

Conflicts:
	default.xml