am 06642342: Merge "Don\'t always add profile-file option to dex2oat"

* commit '066423423f04bf1c5972b1d611e01e2e17df3727':
  Don't always add profile-file option to dex2oat