This reverts commit 0af87e80. clang-r383902 seems to have fixed the crash. Bug: 131854833 Change-Id: I1f6115b482fc50d7eddd884ade66fd4ba205d903