Merge change I37f5ced1 into eclair-mr2

* changes:
  Move various utility classes to android-common