This reverts commit 994b5ad7. Waiting for Chrome prebuilt. Test: NA Bug: 72116995 Change-Id: Ifcfea94ddefda27267640283038c9d0f933ea1d8