Merge "Re-enable ART code paths and tests for ASan that were disabled for Valgrind."
am: a7ecf8a251

Change-Id: I4bd6215e122c74c10e5adf9ea082541b8e84cea6