[automerger skipped] Merge "Revert "header-checker: Remove aosp_{arm64,x86}_ab"" into rvc-dev am: 4b8b6fce68 -s ours

am skip reason: Change-Id I7a80931e8bc60fc86083d6fc55daa53e3ed9a4db with SHA-1 ec315367d5 is in history

Change-Id: I0147ee17088fb5eb6dedfd0666de843ca9318f46