Upstream changes from Chromium Android Clang build.

See https://codereview.chromium.org/11875006/

Change-Id: Ied2a17df2b3222635f84aef120eaa9feb53750d2
3 files changed