Merge changes from topic \'verify-profile\'
am: 4892106

* commit '48921060720e3ff7596e397d09af221fb057eeff':
  Fix incorrect dex2oat check
  Add verify-profile compiler filter