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

Change-Id: Ib3ddad33a505a74e6004123d08e64a177c7045aa