Fix to make the framework asan compatible. am: 4ba40d82e4 am: 06241cdfbd

Change-Id: I797191fb396ca3b3bd1921de163b720e45deaa1c