Merge "Speed up non-AB ota_from_target_files in the build system"
am: 47ba4239c8

Change-Id: I00f06fa1f26563e9c0d3951df986f85105ea8946