Merge "Revert "header-checker: Remove aosp_{arm64,x86}_ab"" am: 311a6fe3ff

Change-Id: I91a302c70da2d3b913813add57a0525a2f5e413f