[automerger skipped] Use FilePusher as the target_preparer for resolv tests...
[automerger skipped] Use FilePusher as the target_preparer for resolv tests am: 4140bbfc am: 97fe0c16 -s ours am: e5e1f57d -s ours
am skip reason: Change-Id I7371c7fbd3889dd522241f2a479bae46f182feba with SHA-1 6b7ff610 is in history
Change-Id: I8159d114e0d5791095131cef49ae563547d14b2d