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

Change-Id: I48ac4956dd89a99c87e9775a2393fd3d5f8d1956