tree 9e8844d083fa66fed797c526e654f8bc17cae718
parent b79f8897472251589814b4690367a50e6ca20096
author Matt Wachowski <mattwach@google.com> 1534375835 -0700
committer Matt Wachowski <mattwach@google.com> 1534376096 -0700

Partially revert ag/4742391.

Needed to fix

https://android-build.googleplex.com/builds/quarterdeck?branch=git_ics-mr1-emu-dev&target=sdk_x86-sdk&lkgb=4951371&fkbb=4954575

It appears that some compiler setups do not accept the C99 syntax

Bug: b/80194417
Test: Recompile
Change-Id: Ica21f2dc24a526358e9ae904fba55e1aa84bc6c8