Merge "Speed up non-AB ota_from_target_files in the build system"