Revert "Fix compile"

This reverts commit a0602705d3076459db056078745d5bdb72f01fd8.
Revert "add ability to remove device assertions"

This reverts commit d7716e2eefd769eb57f1d31a5b4f8af13490f35a.

Conflicts:
	core/Makefile
	tools/releasetools/ota_from_target_files