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