Merge "Disable dex2oat test TestWatchdogTrigger with Valgrind." am: 72fe7ea30a
am: fd7388975b

Change-Id: Iaf7e006972668f97094f25ca01e93a35faca8d7b