Merge "Explicitly search header files in abi dumper." am: a3871b8183

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

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