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

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

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

Committed: https://crrev.com/35fd88c871bd02ad9d7982775d8dd9b0119cadcd
Cr-Commit-Position: refs/heads/master@{#341954}

[newt (away), 2015-08-04 18:49:09]

newt@chromium.org changed reviewers:
+ yusufo@chromium.org

[newt (away), 2015-08-04 18:49:10]

PTAL

[Yusuf, 2015-08-05 00:07:05]

lgtm

[newt (away), 2015-08-05 00:54:20]

The CQ bit was checked by newt@chromium.org

[commit-bot: I haz the power, 2015-08-05 00:55:02]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1264653005/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1264653005/1

[commit-bot: I haz the power, 2015-08-05 01:06:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-08-05 01:06:35]

Try jobs failed on following builders:
  android_chromium_gn_compile_dbg on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromiu...)

[newt (away), 2015-08-05 19:02:40]

The CQ bit was checked by newt@chromium.org

[newt (away), 2015-08-05 19:02:40]

The patchset sent to the CQ was uploaded after l-g-t-m from yusufo@chromium.org
Link to the patchset: https://codereview.chromium.org/1264653005/#ps20001
(title: "fix compile")

[commit-bot: I haz the power, 2015-08-05 19:03:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1264653005/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1264653005/20001

[commit-bot: I haz the power, 2015-08-05 20:17:27]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-08-05 20:18:35]

Patchset 2 (id:??) landed as
https://crrev.com/35fd88c871bd02ad9d7982775d8dd9b0119cadcd
Cr-Commit-Position: refs/heads/master@{#341954}