Remove old Jinja variable names.

Remove the old variable names now that downstream is using the new,
consistent-with-Chrome names.

Change-Id: I55a3e80c25b30b505504ff5268ec86da39a0e2c5
Reviewed-on: https://chromium-review.googlesource.com/1241015Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594364}

android_webview/apk/java/AndroidManifest.xml

@@ -7,10 +7,10 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="{{manifest_package|default(package)|default('com.android.webview')}}"
+    package="{{manifest_package|default('com.android.webview')}}"
     tools:ignore="MissingLeanbackLauncher">
-    <uses-sdk android:minSdkVersion="{{min_sdk_version|default(minsdk)|default(21)}}"
-              android:targetSdkVersion="{{target_sdk_version|default(targetsdk)|default(28)}}">
+    <uses-sdk android:minSdkVersion="{{min_sdk_version|default(21)}}"
+              android:targetSdkVersion="{{target_sdk_version|default(28)}}">
     </uses-sdk>
 
     <uses-feature android:name="android.hardware.touchscreen"
@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application android:label="Android System WebView"
-                 android:icon="@{{manifest_package|default(package)|default('com.android.webview')}}:drawable/icon_webview"
+                 android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview"
                  android:name="{{ application_name|default('com.android.webview.chromium.WebViewApplication') }}"
                  android:multiArch="true"
                  android:use32bitAbi="true">
@@ -61,7 +61,7 @@
                          android:process=":webview_service" />
             {% endif %}
         {% endmacro %}
-        {{ common(manifest_package|default(package)|default('com.android.webview'), library|default('libwebviewchromium.so')) }}
+        {{ common(manifest_package|default('com.android.webview'), library|default('libwebviewchromium.so')) }}
         {% if donor_package is defined %}
             <meta-data android:name="com.android.webview.WebViewDonorPackage"
                        android:value="{{ donor_package }}" />