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

Change-Id: Iade64c6a75182941ee5071df8324c8da9693d2d0