fix clang 3.5 build

Change-Id: I86fe850b4b7bc8fc4c44717ca813772114ca70ff