Merge change I4a4323c0 into eclair-mr2

* changes:
  Fixes scroll/measure bug in EditText