Merge remote-tracking branch 'origin/master' into profiling

Conflicts:
	config.sh
	flash.sh
	run-gdb.sh
	tools/include/device_utils.py
	tools/update-tools/build-flash-fota.py
	tools/update-tools/update_tools.py
Fix build errors caused by the silence-logging patch