fix up boot_flash_from_image
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging

Conflicts:
	tools/releasetools/boot_flash_from_image