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

Change-Id: If0ede202f577d8e1452c7905a4a06e7d36bce761