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

Change-Id: I18a578abc86fc2b24e684977eaf254a438bc4ccd