Merge changes I4f6de0af,Id6805e03

* changes:
  ART: Disable watchdog test for non-CC
  Revert "ART: Add barrier to dex2oat watchdog startup"