am 28caf262: Update imports to android-common

Merge commit '28caf262cf4f5724ff372a1d97f5130299e3a368' into eclair-mr2-plus-aosp

* commit '28caf262cf4f5724ff372a1d97f5130299e3a368':
  Update imports to android-common