[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 skip reason: Change-Id I7371c7fbd3889dd522241f2a479bae46f182feba with SHA-1 6b7ff610 is in history
Change-Id: I3e7f5cf356968c3548c22dfdb1eddb6c3181637b