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

Change-Id: I07245bc50668567598714bd9e94d48fcee762024