Clang trunk compat fix

Change-Id: Ic414ad0416e27e223ff702996b796b68d39709b9