[automerger skipped] Use .runner_config instead of .config am: b79e000523
am: 700c8185bc  -s ours

Change-Id: I5944022161c58f82cbb5c44ca02a6a42fab900d6