Update APK generation scripts to take custom keystore names and passwords.

build/android/gyp/finalize_apk.py

Index: build/android/gyp/finalize_apk.py
===================================================================
--- build/android/gyp/finalize_apk.py	(revision 258428)
+++ build/android/gyp/finalize_apk.py	(working copy)
@@ -15,16 +15,16 @@
 
 from util import build_utils
 
-def SignApk(keystore_path, unsigned_path, signed_path):
+def SignApk(key_path, key_name, key_passwd, unsigned_path, signed_path):
   shutil.copy(unsigned_path, signed_path)
   sign_cmd = [
       'jarsigner',
       '-sigalg', 'MD5withRSA',
       '-digestalg', 'SHA1',
-      '-keystore', keystore_path,
-      '-storepass', 'chromium',
+      '-keystore', key_path,
+      '-storepass', key_passwd,
       signed_path,
-      'chromiumdebugkey',
+      key_name,
     ]
   build_utils.CheckOutput(sign_cmd)
 
@@ -46,14 +46,17 @@
   parser.add_option('--unsigned-apk-path', help='Path to input unsigned APK.')
   parser.add_option('--final-apk-path',
       help='Path to output signed and aligned APK.')
-  parser.add_option('--keystore-path', help='Path to keystore for signing.')
+  parser.add_option('--key-path', help='Path to keystore for signing.')
+  parser.add_option('--key-passwd', help='Keystore password')
+  parser.add_option('--key-name', help='Keystore name')
   parser.add_option('--stamp', help='Path to touch on success.')
 
   options, _ = parser.parse_args()
 
   with tempfile.NamedTemporaryFile() as intermediate_file:
     signed_apk_path = intermediate_file.name
-    SignApk(options.keystore_path, options.unsigned_apk_path, signed_apk_path)
+    SignApk(options.key_path, options.key_name, options.key_passwd,
+            options.unsigned_apk_path, signed_apk_path)
     AlignApk(options.android_sdk_root, signed_apk_path, options.final_apk_path)
 
   if options.stamp: