Merge "Upstream changes from Chromium Android Clang build." into experimental
authorJim Bankoski <jimbankoski@google.com>
Sat, 12 Jan 2013 01:06:26 +0000 (17:06 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sat, 12 Jan 2013 01:06:26 +0000 (17:06 -0800)

Trivial merge