Update imports to android-common

Several files were moved to android-common. Update all the references
to import those files from the new location.
35 files changed