Merge "ART: Refactor dex2dex compilation" am: 199f72b1b5
am: f2ecda5f52

Change-Id: Iee49a5a99863cb7d8589053874e1ffdb5280a490