GitLab

The CTS build is broken because of this change.

This reverts commit d4b40bae.

Bug: 16483829
Change-Id: Ie86eb2a4720e8a5372354d6ea4600dadd1d47945