drop this duplicate line for recovery
	modified:   tools/releasetools/ota_from_target_files
let's dump the changelog when ridin dirty
	modified:   core/main.mk
Merge remote-tracking branch 'ls/kitkat' into jflte

Conflicts:
	tools/releasetools/ota_from_target_files