GitLab

This reverts commit d0ca87de.

Added ifdef guard for death tests.

Bug: internal b/71559266
Change-Id: I204a00d7a1759a4a18407f5162843366e9229da5
Reviewed-on: https://chromium-review.googlesource.com/941789Reviewed-by: Scott Graham <scottmg@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Commit-Queue: Kenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539976}