Merge "Add -print-resource-dir to header-abi-dumper"