Update to identically match the sources used on Android

Review URL: https://codereview.chromium.org/1020563002
2 files changed