[Android] make it work after rebase to 34

Passed Tests:
Manually loading page with core shell and client shell.
Instrumentation tests for core shell.