am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

* commit 'a258b4a9e8a519c3b181848c9b8fb2f0e2142d8f':
  Add dex2oat-flags plumbing to AndroidRuntime