[automerger skipped] Merge "Pull corpus_trigger to directory unique to each testcase." am: c01c4f97bc am: ace0e4a349 am: 6c74543226  -s ours am: 301ea09da3  -s ours am: f070f0f990  -s ours
am: 74b69effa5  -s ours

Change-Id: Id6c607427b2ac3a8492123ae0a4ebefcee734d57