Add v4/v13 support libs to LMP samples

Support libs were removed from non-numeric sample versions. Instead, we
should be including the v4/v13 versions since some samples still use the
support libs for fragments.

Change-Id: I2b612ea9c5a2a048aeea2fdb5fb46833dfccde39
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 6799cd8..9001d3a 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -36,19 +36,15 @@
 dependencies {
 
 <#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true">
-  <#if sample.minSdk?is_number >
-  // Add the support lib that is appropriate for SDK ${sample.minSdk}
-  <#if sample.minSdk?number < 7>
+  <#if sample.minSdk?is_number && sample.minSdk?number < 7>
     compile "com.android.support:support-v4:19.1.+"
-  <#elseif sample.minSdk?number < 13>
+  <#elseif sample.minSdk?is_number && sample.minSdk?number < 13>
     compile "com.android.support:support-v4:19.1.+"
     compile "com.android.support:gridlayout-v7:19.1.+"
-  <#elseif sample.minSdk?number < 20>
+  <#else>
     compile "com.android.support:support-v4:19.1.+"
     compile "com.android.support:support-v13:19.1.+"
   </#if>
-  </#if>
-
 </#if>
 
 <#list sample.dependency as dep>