Merge "Add -print-resource-dir to header-abi-dumper" am: 2400a70623 am: 01bbf31411 am: 50d7f9b981 am: dbae6f00b5

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

Change-Id: I083335eede22431a0a67df01b1e3edf4da05f6ef