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

* commit '6991d136b66d79d15ecf90efcda42bcb25a96671':
  Fix incorrect dex2oat check
  Add verify-profile compiler filter