am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev

* commit '3796594cd76238c46dd79a990ae1797f197dea85':
  Run finalizers before counting for StrictMode.