Revert 639 imports

Reverts github/android#639