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

Change-Id: Ibcc2e802dec3f1d3b445a9bb348b45b704ce811b