Roll third_party/aosp third_party/webgl_conformance

This is to pick up recent fixes to license metadata.

third_party/aosp: r122156 to r148330
- r122930 - Add svn:ignore to aosp
- r148330 - Fix licensing metadata for third_party/aosp

third_party/webgl_conformance: r138171 to r148561
- r148561 - Fix license metadata for ffmpeg and WebGL conformance tests

BUG=138921

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

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

DEPS

@@ -192,7 +192,7 @@ deps = {
   # When roll to another webgl conformance tests revision, please goto
   # chrome/test/gpu and run generate_webgl_conformance_test_list.py.
   "src/third_party/webgl_conformance":
-    "/trunk/deps/third_party/webgl/sdk/tests@138171",
+    "/trunk/deps/third_party/webgl/sdk/tests@148561",
 
   # We run these layout tests as UI tests. Since many of the buildbots that
   # run layout tests do NOT have access to the LayoutTest directory, we need
@@ -470,7 +470,7 @@ deps_os = {
       "@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7",
 
     "src/third_party/aosp":
-      "/trunk/deps/third_party/aosp@122156",
+      "/trunk/deps/third_party/aosp@148330",
   },
 }