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

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

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