Merge "Pass targetSdkVersion to dex2oat"