tree b9b66071b0dc06a9a7c649447275798db197c8b0
parent ae26dee4de729ee4c840067afa88e2a199348ea2
author Mathias Agopian <mathias@google.com> 1491264871 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1497553391 +0000

fix race condition that can cause a use after free

Backported from 12a0ccd6f7201bac706d903ac3f436c4358fe203.

Bug: 33004354
Test: manual
Change-Id: I9b38ee644b02268c9b995a330db758aa2e568399
(cherry picked from commit 59485525a6047453e6ba16c03989381e2a0d56ec)