Roll third_party/aosp and third_party/webgl_conformance

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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=148632

[Steve Block, 2012-07-26 17:51:53]

ffmpeg will be rolled separately, as an update of the copy in deps/ snapshot is
already in progress.

[Nico, 2012-07-26 17:54:28]

lgtm

Now that you mention it, I think we pull ffmpeg from git instead of svn these
days. Talk to dalecurtis@, he set that up.

[Nico, 2012-07-26 17:54:49]

On 2012/07/26 17:54:28, Nico wrote:
> lgtm
> 
> Now that you mention it, I think we pull ffmpeg from git instead of svn these
> days. Talk to dalecurtis@, he set that up.

(i.e. your README.chromium change in ffmpeg might've been a no-op. Not sure
though.)

[Steve Block, 2012-07-26 18:29:41]

Yes, I'm coordinating the ffmpeg roll with Dale.

[commit-bot: I haz the power, 2012-07-26 18:30:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/steveblock@chromium.org/10827044/1

[Steve Block, 2012-07-26 22:15:55]

It looks like the failures are just flakiness, but the bot is having problems,
so landing manually.