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

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