Merge "Respect VABC Xor prop in ota_from_target_files"