Merge "Extend header-abi-dumper/linker --root-dir" am: ece19b2c70 am: 43a899b438

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

Change-Id: I50ff7ccd3300f017b1626094a012a2b198b5ee82