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

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

Change-Id: I0d38a6f7d43a52ce5df98b7b31b0a78d3e19fd92