Merge pull request #2346 from wang16/next

Gardening M38 for Android port
Gardening M38 : Fix compilation on Android.

https://codereview.chromium.org/382143005 refactored authentification
for dev tools debugging. This patch adapts our code to the new approach.
Merge pull request #2343 from darktears/next

Gardening M38 : Fix compilation on Android.
Gardening M38 : Fix Windows build.
Gardening M38: Contents client now needs to own NotificationDelegate

According to upstream commit e4c9ef21d. Crosswalk on Android need
similar approach to own NotificationDelegate for each web
notification.

Use ScopedPtrHashMap for it.

BUG=https://crosswalk-project.org/jira/browse/XWALK-2404