Merge change 25751 into eclair
Android (Google) Code Review authored
* changes:
  use correct rowbytes, instead of assuming it equals bounds.width()
09c03e4e