Merge change I98819b18 into eclair-mr2

* changes:
  Allow resource and file URIs in ImageView.setImageURI()