Merge "Disable Dex2oatWatchdogTest.TestWatchdogTrigger."
am: 0edbfb03b2

Change-Id: I051b57ad185fa8788f5e1cae48e92d3a0566ecb7