Fix compile error for clang update. am: 0d0d97559b

Change-Id: If8d001f50bc461741c90cf80de9ddeb78dc2eb9f