Merge "Fix dexopt dump" into oc-mr1-dev am: 479af339de
am: 97de54bdda

Change-Id: Iaeb4ce6d248ae988ffd68a609bb572d600bc1698