am 115def16: Update imports to android-common

Merge commit '115def16fa2da20a0be7105b7d987d8b6fd1f8d9' into eclair-mr2-plus-aosp

* commit '115def16fa2da20a0be7105b7d987d8b6fd1f8d9':
  Update imports to android-common