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