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

Change-Id: I1ce2dd66298058e26e623ed39eec413575a10a7c