Roll third_party/aosp and third_party/webgl_conformance

DEPS

 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 
 vars = {
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
   "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
@@ skipping 174 matching lines @@
 
   "src/third_party/bidichecker":
     (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4",
 
   "src/third_party/v8-i18n":
     (Var("googlecode_url") % "v8-i18n") + "/trunk@105",
 
   # 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
   # to map them here. In practice, these do not take up much space.
   "src/content/test/data/layout_tests/LayoutTests/fast/events":
     Var("webkit_trunk") + "/LayoutTests/fast/events@" +
     Var("webkit_revision"),
   "src/content/test/data/layout_tests/LayoutTests/fast/js/resources":
     Var("webkit_trunk") + "/LayoutTests/fast/js/resources@" +
     Var("webkit_revision"),
@@ skipping 257 matching lines @@
     "src/third_party/cros_system_api":
       Var("chromiumos_git") + "/platform/system_api.git" +
       "@da5b4f13d8f80f70909d474f1b6814df1a97302d",
   },
   "android": {
     "src/third_party/freetype":
       Var("chromium_git") + "/chromium/src/third_party/freetype.git" +
       "@1f74e4e7ad3ca4163b4578fc30da26a165dd55e7",
 
     "src/third_party/aosp":
-      "/trunk/deps/third_party/aosp@122156",
+      "/trunk/deps/third_party/aosp@148330",
   },
 }
 
 
 include_rules = [
   # Everybody can use some things.
   "+base",
   "+build",
   "+googleurl",
   "+ipc",
@@ skipping 80 matching lines @@
     "pattern": ".",
     "action": ["python", "src/build/util/lastchange.py",
                "-o", "src/build/util/LASTCHANGE"],
   },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
     "action": ["python", "src/build/gyp_chromium"],
   },
 ]