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

Change-Id: Id7c91a89b8fe7d719ed04ab187d2f9ee97bdf8b4