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

* commit 'a63cd9f424d70a3f8ca059aa8f76b28be1f9fa07':
  Run finalizers before counting for StrictMode.