Merge "Always set targetSdkLevel to DefaultAppTargetSdk" am: 62bd3c7b47

Change-Id: I2aae04937917406f12c7446aa5e4349a4aa5d143