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