Merge "temporarily disable FORTIFY in header-abi-dumper"
am: 1e7c8fe0da

Change-Id: I1d1e7d0ad32b3379e40aa58850fbb59405b6e978