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

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