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

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