Fix flakiness in PollingWatchServiceTest by checking for either possible outcome when a file is both modified and deleted. Sometimes polling happens between the modification and the delete.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=61386432