GitLab

Adds two fixes for Xcode 10 / iOS 12.

Bug: 843236
Change-Id: If619d0899e65fd86cf98a980dd0e6b741a4f5d90
Reviewed-on: https://chromium-review.googlesource.com/1142601Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576480}