Merge change 22430 into eclair

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