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

Change-Id: Ib11936fce51d57850e64c45334040b95b157249e