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

Change-Id: I851cd11dcb85bce59d29b0fa7b113ea1fcb46442