Attempt to fix clang FORTIFY build breakage.
am: 369babf60a

Change-Id: I3e5bb87bf49ea9010364b88e227d0f4f02d40b43