Merge "Fix the unit test for header-abi-dumper -print-resource-dir" am: 9ea932b958

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

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