Partially revert change 81ea0314

Partial revert of change 81ea0314ca2eeadcd918a7cf6570152d69260e21 in
order to fix build in Android Studio, since the repo environment isn't
available there.

Change-Id: I7696c1d1a7dac8fbc8721500db7c1152b2b479ad
1 file changed