This is a reland of 4ccb6508

http://crrev.com/c/2367397 and this CL were prepared without
the authors being aware of each other's efforts.

Timeline for 2367397:
Sep 10, 2020, 6:06:39AM UTC+10 it is submitted to CQ
Sep 10, 2020, 9:01:21AM UTC+10 it is successfully submitted

Timeline for 2402560
Sep 10, 2020, 10:46:31AM UTC+10 dry run is successfully completed
Sep 10, 2020, 12:19:23PM UTC+10 it is submitted to CQ
Sep 10, 2020, 12:23:56PM UTC+10 it is successfully submitted


Original change's description:
> Files SWA: Moving to a new directory.
>
> Bug: 1111229
> Change-Id: Id0509caf9d1d9de8efa293344e682610cf1a8699
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2381330
> Reviewed-by: Dominick Ng <dominickn@chromium.org>
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Reviewed-by: Jiewei Qian  <qjw@chromium.org>
> Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> Commit-Queue: Bo Majewski <majewski@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#805598}

Bug: 1111229
Change-Id: I8894da793702136d5e394b9854993026603c311d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2402560
Commit-Queue: Bo Majewski <majewski@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Reviewed-by: Jiewei Qian  <qjw@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806865}