Merge "Revert^2 "Re-enable some more ART gtests when running under ASan.""
am: 7496a1e805

Change-Id: Id83d11b3dbb56a89ab5e952f3e738615bbd9265d