Merge "samples: Remove compileSdkVersion/targetSdkVersion from template-parms" into nyc-dev