Merge "Run dex2oat from the staged apk directory." am: 296d91edc8
am: 7b30832493

Change-Id: Ica5c4f3bbfb1f99fd21251917f223b6e04658ffc