This reverts commit a6ffab6b.

Reason for revert: with CL 57290 the tests run on Android again.

Change-Id: Ifeb29762a4cd0178463acfeeb3696884d99d2993
Reviewed-on: https://go-review.googlesource.com/57310Reviewed-by: Alex Brainman <alex.brainman@gmail.com>