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

Change-Id: Ifeea7db10217543d49bdd1cf1e657287b313521a