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

Change-Id: Id7fc886abaa61ff4197eaa896112a415567c263c