Merge "Extend header-abi-dumper/linker --root-dir"