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

Change-Id: Ib02de2baab7a076908a7b5ccafef62ba394a0b0a