GitLab

Also includes two #ifdef-out of deprecated code unrelated
to orientation.

Bug: 1131852
Change-Id: Ia229a421d0b9f9e9d655791d43b0cb59c0b0e75c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612898
Commit-Queue: David Jean <djean@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841433}