am fd1e757f: Update imports to android-common

Merge commit 'fd1e757ff2095cb1c41fb0f5bb39d6b8461617ea' into eclair-mr2-plus-aosp

* commit 'fd1e757ff2095cb1c41fb0f5bb39d6b8461617ea':
  Update imports to android-common