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

Change-Id: I3fe2a1e60a8fd3a8e6726940249e523837ddb733