Cherry pick "Fix strict mode violations in Android."

Fix strict mode violations in Android.

BUG=408525
Committed:
https://chromium.googlesource.com/chromium/src/+/6c4efa4876f1397b51d4e067d73ecb202b860147

Bug: 17313418
Change-Id: I1417d0cff8e6de00ef5dde601d1d5c404423d887
2 files changed