am a87b7e20: Manual cherry-pick of "Remove bookmarks provider..."

* commit 'a87b7e2066601f09d195ea6371978fee84ec6c08':
  Manual cherry-pick of "Remove bookmarks provider..."
tree: bea1177b8ebabc011e835541c10203ef1408dcf7
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk