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

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

Change-Id: I112bb6d38d02550c63d207077f75703503f0200e