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

Change-Id: Ibb34264848e1e4c7b800b35a7a4dd61e551b42ee