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