Merge change Id7515f9a into eclair

* changes:
  New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.