Clean up task affinity.
am: ff3652e0a3

Change-Id: I6727cae2ce9330860ad40104b20e00e8ecf58556