+amineer, what's the mini branch again?

3029_108 for the minibranch; let's merge to 3029 as well to be safest.  Also merge to 59 (3071) and 60 (3112) as well.

context: b/38379972

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4f2b4e14142e177b3692a2cbb638a97391b23f7b

commit 4f2b4e14142e177b3692a2cbb638a97391b23f7b
Author: Bo Liu <boliu@chromium.org>
Date: Fri May 26 22:55:21 2017

android: Use the raw os version string in ua

Android webview requires that the os version string in its user agent
must match exactly the version string from Android.

Change the logic in SysInfo::OperatingSystemVersion to return the raw
string if the string parses correctly. Note it still falls back to the
dummy/default version if parsing fails. Then call OperatingSystemVersion
directly to construct the UA string.

BUG= 726845 

Change-Id: I986853de3762b0df4d283d583e6b76e84dabd6a8
Reviewed-on: https://chromium-review.googlesource.com/517408
Commit-Queue: Bo Liu <boliu@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#475173}
[modify] https://crrev.com/4f2b4e14142e177b3692a2cbb638a97391b23f7b/base/sys_info_android.cc
[modify] https://crrev.com/4f2b4e14142e177b3692a2cbb638a97391b23f7b/content/common/user_agent.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f3f670f8bb5728fbac8f731320c8bdf8d29c5cc2

commit f3f670f8bb5728fbac8f731320c8bdf8d29c5cc2
Author: Bo Liu <boliu@chromium.org>
Date: Fri May 26 23:53:40 2017

[Merge M60] android: Use the raw os version string in ua

Android webview requires that the os version string in its user agent
must match exactly the version string from Android.

Change the logic in SysInfo::OperatingSystemVersion to return the raw
string if the string parses correctly. Note it still falls back to the
dummy/default version if parsing fails. Then call OperatingSystemVersion
directly to construct the UA string.

BUG= 726845 
TBR=boliu@chromium.org

(cherry picked from commit 4f2b4e14142e177b3692a2cbb638a97391b23f7b)

Change-Id: I986853de3762b0df4d283d583e6b76e84dabd6a8
Reviewed-on: https://chromium-review.googlesource.com/517408
Commit-Queue: Bo Liu <boliu@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#475173}
Reviewed-on: https://chromium-review.googlesource.com/517439
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#6}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}
[modify] https://crrev.com/f3f670f8bb5728fbac8f731320c8bdf8d29c5cc2/base/sys_info_android.cc
[modify] https://crrev.com/f3f670f8bb5728fbac8f731320c8bdf8d29c5cc2/content/common/user_agent.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a243d4abf6c01f336a887112656ce529281fd754

commit a243d4abf6c01f336a887112656ce529281fd754
Author: Bo Liu <boliu@chromium.org>
Date: Fri May 26 23:55:16 2017

[Merge M59] android: Use the raw os version string in ua

Android webview requires that the os version string in its user agent
must match exactly the version string from Android.

Change the logic in SysInfo::OperatingSystemVersion to return the raw
string if the string parses correctly. Note it still falls back to the
dummy/default version if parsing fails. Then call OperatingSystemVersion
directly to construct the UA string.

BUG= 726845 
TBR=boliu@chromium.org

(cherry picked from commit 4f2b4e14142e177b3692a2cbb638a97391b23f7b)

Change-Id: I986853de3762b0df4d283d583e6b76e84dabd6a8
Reviewed-on: https://chromium-review.googlesource.com/517408
Commit-Queue: Bo Liu <boliu@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#475173}
Reviewed-on: https://chromium-review.googlesource.com/517665
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/branch-heads/3071@{#711}
Cr-Branched-From: a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}
[modify] https://crrev.com/a243d4abf6c01f336a887112656ce529281fd754/base/sys_info_android.cc
[modify] https://crrev.com/a243d4abf6c01f336a887112656ce529281fd754/content/common/user_agent.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8d1c460f10f8990b7c0655b1b6e9242ad195e9c1

commit 8d1c460f10f8990b7c0655b1b6e9242ad195e9c1
Author: Bo Liu <boliu@chromium.org>
Date: Fri May 26 23:56:31 2017

[Merge M58] android: Use the raw os version string in ua

Android webview requires that the os version string in its user agent
must match exactly the version string from Android.

Change the logic in SysInfo::OperatingSystemVersion to return the raw
string if the string parses correctly. Note it still falls back to the
dummy/default version if parsing fails. Then call OperatingSystemVersion
directly to construct the UA string.

BUG= 726845 
TBR=boliu@chromium.org

(cherry picked from commit 4f2b4e14142e177b3692a2cbb638a97391b23f7b)

Change-Id: I986853de3762b0df4d283d583e6b76e84dabd6a8
Reviewed-on: https://chromium-review.googlesource.com/517408
Commit-Queue: Bo Liu <boliu@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#475173}
Reviewed-on: https://chromium-review.googlesource.com/517231
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/branch-heads/3029@{#861}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
[modify] https://crrev.com/8d1c460f10f8990b7c0655b1b6e9242ad195e9c1/base/sys_info_android.cc
[modify] https://crrev.com/8d1c460f10f8990b7c0655b1b6e9242ad195e9c1/content/common/user_agent.cc

mini-branch one here: https://chromium-review.googlesource.com/c/517394/

not sure why bugdroid didn't wake up