Update GetNewMetadata function to be more forgiving for directory names.

Fixes an issue when using managed_install=1 with Android L.

BUG=None
NOTRY=true
TBR=cjhopman@chromium.org

Review URL: https://codereview.chromium.org/380343003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282469 0039d316-1c4b-4281-b951-d872f2087c98

build/android/gyp/apk_install.py

@@ -31,7 +31,7 @@ def GetNewMetadata(device, apk_package):
   # org.chromium.chrome.shell.apk
   # -rw-r--r-- system   system    7376582 2013-04-19 16:34 \
   # org.chromium.chrome.shell-1.apk
-  apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?.apk$' % apk_package, s)
+  apk_matcher = lambda s: re.match('.*%s(-[0-9]*)?(.apk)?$' % apk_package, s)
   matches = filter(apk_matcher, output)
   return matches[0] if matches else None