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

* commit '7390d4ab8d12d5ffa5d28341096f4425247204a0':
  Run finalizers before counting for StrictMode.