Merge "dex2oat: Watchdog uses CLOCK_MONOTONIC instead of CLOCK_REALTIME"
am: 6877edd239

Change-Id: I65da88929e0421376441c6e7e915cfccae6ecc2f