tree 3fde11238ef0aea291136f297a639db5c15eb02c
parent e8dbc1a3fa08d18cd327df2a5ceeb42d1923b1af
author Mathias Agopian <mathias@google.com> 1491264871 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1497554086 +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)