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