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

Change-Id: Ie392d157a320fba28e91214af4486d09d671a23a