Merge "Revert "ART: Disable test 137 for ASAN"" am: dbd3c89ae7
am: e4c586bddb

Change-Id: If4c079b82fc32f5063274d10dfa8a9c16a6c079d