Merge chrome/browser/android/bookmark[s] folders.

No need for a "bookmark" folder and a "bookmarks" folder.

Review URL: https://codereview.chromium.org/1264653005

Cr-Commit-Position: refs/heads/master@{#341954}
5 files changed