Merge change 22566 into eclair

* changes:
  Simplify CDMA Status Bar icons