am cd5a2960: am b321625b: Merge change 22430 into eclair

Merge commit 'cd5a2960bc8e6aebf889f0373247f6edd4b1fe93'

* commit 'cd5a2960bc8e6aebf889f0373247f6edd4b1fe93':
  Remove frameworks/base/im since these stuff are only used by IM app