Merge "Remove unused property-watcher thread for native coverage flushing." am: 12ac200f2e am: f4fe46858c am: 58ae51b18a

Change-Id: Id8b40a9d4b5328605d366be0682dc924105624f9