Merge "Run dex2oat from the staged apk directory." into oc-dev