Adapt to Clang <= 3.4

Change-Id: If9c9d63d85ce29629e6453f2d69355bd64ac2fc5