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