Merge "Explicitly search header files in abi dumper." am: a3871b8183 am: 3db068e5db am: 4169d8c290

Original change: https://android-review.googlesource.com/c/platform/development/+/2359334

Change-Id: I2df18ac3cb44b7db478162bd4674248025ce91c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>