The tentative fix did not fix the issue on Android Nexus 5x.

This reverts commit 8688bf46.

NOTRY=true
Change-Id: If4a517028951a2232a87aeaf1045a5df731d17d3
Reviewed-on: https://chromium-review.googlesource.com/1065578Reviewed-by: Luc Ferron <lucferron@chromium.org>