[automerger skipped] Clean up task affinity. am: ff3652e0a3
am: eb43cc70c8  -s ours

Change-Id: I21db6e54e025668c68ed3ff1d62dd13925790f8f