tree 9827260541fdbcb505d58be8b86fc02739056a69
parent 457ffc5b2406e5bb6dd568d78a8f08afdf0d9cb3
author Mathias Agopian <mathias@google.com> 1491264871 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1497638935 +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)