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

Change-Id: I1847a923740b6a4dca0008c2bd6109caaf106f78