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