am f59fd67f: am f562b6b2: Merge "Up-to-date odex files should take precedence over profile checks"

* commit 'f59fd67ff4af84d7abe28ffbcce6c89fd5979528':
  Up-to-date odex files should take precedence over profile checks