Fix License string in scrypt/README.chromium, update Android WebView checker

In README.chromium, BSD license should be written as "BSD N-Clause License".
Also, update Android WebView's license checker to accept BSD 2-Clause.

TBR=torne@chromium.org,bcwhite@chromium.org
NOTRY=true


Review URL: https://chromiumcodereview.appspot.com/11742039

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

android_webview/tools/webview_licenses.py

@@ -41,7 +41,7 @@ def GetIncompatibleDirectories():
 
   whitelist = [
     'Apache( Version)? 2(\.0)?',
-    '(New )?BSD( 3-Clause)?( with advertising clause)?',
+    '(New )?BSD( [23]-Clause)?( with advertising clause)?',
     'L?GPL ?v?2(\.[01])?( or later)?',
     'MIT(/X11)?(-like)?',
     'MPL 1\.1 ?/ ?GPL 2(\.0)? ?/ ?LGPL 2\.1',

third_party/scrypt/README.chromium

@@ -3,7 +3,7 @@ Name: Secure Encryption
 Version: 1.1.6
 URL: http://www.tarsnap.com/scrypt.html
 Date: 2012-12-13
-License: 2-clause BSD license
+License: BSD 2-Clause License
 License File: LICENSE
 Security Critical: yes