Merge "Added DexFileAsanRegistrar and necessary additions" am: ef878ea6b8 am: 50649e5dd5
am: abfd58e32f

Change-Id: I6f0c942e002591a3c347dd847860e698f1a8b526