Merge "Added DexFileAsanRegistrar and necessary additions"
am: ef878ea6b8

Change-Id: Id97e80617baa07a16d4502e7dade99e6aec92331