Merge changes I59323dc5,I31a01aa3 into ics-mr1

* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.