Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""
am: 5c58020c00

Change-Id: I107ce2043fd261b08413418825daf6c35f808228