Fix build. New clang has stricter checking.

Change-Id: I1c8a826f41ed9fa503ce0545d85c198a5151ab6e
3 files changed