Merge change I16925b91 into eclair

* changes:
  Finish fixing issue #2228381: android.view.InflateException...