Merge change I5dfb2567 into eclair

* changes:
  Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.