Revert "Fix issues due to updated toolchain."

Bug: http://b/35845221

This reverts commit 8de129774aeb8ad4ae0623e2d335cfd52e63f5c1.

Reason for revert: b/111579848 is fixed.
Test: Presubmit testing.

Change-Id: I68fda31b8f5e739b65bb89db2325b2d3e064c939
1 file changed