Merge \\"samples: Remove compileSdkVersion/targetSdkVersion from template-parms\\" into nyc-dev am: a23225e7 am: 39d81a01 Change-Id: Ief61f533ac927a395d3c03cb937c835f89d06e83