Merge "Pass targetSdkVersion to dex2oat" am: 54bcf1c194
am: 772beadee8

Change-Id: I78ec749f1390b00874c8fa0a97e3ece87c3d629e