Revert "Revert 639 imports"

Reverts github/android#642