Merge "Run dex2oat from the staged apk directory." am: 296d91edc8 am: 7b30832493 am: 27167f9cd0
am: bba4b8a1fd  -s ours

Change-Id: I3941cf4218c4d617b856cc4de25e32b20f8566cc